Skip to content

Commit 74bbb40

Browse files
author
Huseyin Unal
committed
Update test and docs
1 parent 9165595 commit 74bbb40

File tree

2 files changed

+51
-8
lines changed

2 files changed

+51
-8
lines changed

gitlab/resource_gitlab_project_level_mr_approvals.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func resourceGitlabProjectLevelMRApprovalsRead(d *schema.ResourceData, meta inte
7676
return fmt.Errorf("couldn't read approval configuration: %w", err)
7777
}
7878

79-
d.Set("projectId", projectId)
79+
d.Set("project_id", projectId)
8080
d.Set("reset_approvals_on_push", approvalConfig.ResetApprovalsOnPush)
8181
d.Set("disable_overriding_approvers_per_merge_request", approvalConfig.DisableOverridingApproversPerMergeRequest)
8282
d.Set("merge_requests_author_approval", approvalConfig.MergeRequestsAuthorApproval)

gitlab/resource_gitlab_project_level_mr_approvals_test.go

Lines changed: 50 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,35 @@ func TestAccGitlabProjectLevelMRApprovals_basic(t *testing.T) {
2020
Providers: testAccProviders,
2121
CheckDestroy: testAccCheckGitlabProjectLevelMRApprovalsDestroy,
2222
Steps: []resource.TestStep{
23+
{
24+
SkipFunc: isRunningInCE,
25+
Config: testAccGitlabProjectLevelMRApprovalsConfig(rInt),
26+
Check: resource.ComposeTestCheckFunc(
27+
testAccCheckGitlabProjectLevelMRApprovalsExists("gitlab_project_level_mr_approvals.foo", &projectApprovals),
28+
testAccCheckGitlabProjectLevelMRApprovalsAttributes(&projectApprovals, &testAccGitlabProjectLevelMRApprovalsExpectedAttributes{
29+
resetApprovalsOnPush: true,
30+
disableOverridingApproversPerMergeRequest: true,
31+
mergeRequestsAuthorApproval: true,
32+
mergeRequestsDisableCommittersApproval: true,
33+
}),
34+
),
35+
},
2336
{
2437
SkipFunc: isRunningInCE,
2538
Config: testAccGitlabProjectLevelMRApprovalsUpdateConfig(rInt),
39+
Check: resource.ComposeTestCheckFunc(
40+
testAccCheckGitlabProjectLevelMRApprovalsExists("gitlab_project_level_mr_approvals.foo", &projectApprovals),
41+
testAccCheckGitlabProjectLevelMRApprovalsAttributes(&projectApprovals, &testAccGitlabProjectLevelMRApprovalsExpectedAttributes{
42+
resetApprovalsOnPush: false,
43+
disableOverridingApproversPerMergeRequest: false,
44+
mergeRequestsAuthorApproval: false,
45+
mergeRequestsDisableCommittersApproval: false,
46+
}),
47+
),
48+
},
49+
{
50+
SkipFunc: isRunningInCE,
51+
Config: testAccGitlabProjectLevelMRApprovalsConfig(rInt),
2652
Check: resource.ComposeTestCheckFunc(
2753
testAccCheckGitlabProjectLevelMRApprovalsExists("gitlab_project_level_mr_approvals.foo", &projectApprovals),
2854
testAccCheckGitlabProjectLevelMRApprovalsAttributes(&projectApprovals, &testAccGitlabProjectLevelMRApprovalsExpectedAttributes{
@@ -48,14 +74,13 @@ func TestAccGitlabProjectLevelMRApprovals_import(t *testing.T) {
4874
Steps: []resource.TestStep{
4975
{
5076
SkipFunc: isRunningInCE,
51-
Config: testAccGitlabProjectLevelMRApprovalsUpdateConfig(rInt),
77+
Config: testAccGitlabProjectLevelMRApprovalsConfig(rInt),
5278
},
5379
{
54-
SkipFunc: isRunningInCE,
55-
ResourceName: resourceName,
56-
ImportState: true,
57-
ImportStateVerify: true,
58-
ImportStateVerifyIgnore: []string{"project_id"},
80+
SkipFunc: isRunningInCE,
81+
ResourceName: resourceName,
82+
ImportState: true,
83+
ImportStateVerify: true,
5984
},
6085
},
6186
})
@@ -133,7 +158,7 @@ func testAccCheckGitlabProjectLevelMRApprovalsExists(n string, projectApprovals
133158
}
134159
}
135160

136-
func testAccGitlabProjectLevelMRApprovalsUpdateConfig(rInt int) string {
161+
func testAccGitlabProjectLevelMRApprovalsConfig(rInt int) string {
137162
return fmt.Sprintf(`
138163
resource "gitlab_project" "foo" {
139164
name = "foo-%d"
@@ -150,3 +175,21 @@ resource "gitlab_project_level_mr_approvals" "foo" {
150175
}
151176
`, rInt)
152177
}
178+
179+
func testAccGitlabProjectLevelMRApprovalsUpdateConfig(rInt int) string {
180+
return fmt.Sprintf(`
181+
resource "gitlab_project" "foo" {
182+
name = "foo-%d"
183+
description = "Terraform acceptance tests"
184+
visibility_level = "public"
185+
}
186+
187+
resource "gitlab_project_level_mr_approvals" "foo" {
188+
project_id = gitlab_project.foo.id
189+
reset_approvals_on_push = false
190+
disable_overriding_approvers_per_merge_request = false
191+
merge_requests_author_approval = false
192+
merge_requests_disable_committers_approval = false
193+
}
194+
`, rInt)
195+
}

0 commit comments

Comments
 (0)