Skip to content

Commit b1e7065

Browse files
Pulling out the hardcoded test user
1 parent 111a59c commit b1e7065

3 files changed

Lines changed: 50 additions & 43 deletions

File tree

builtin/providers/github/provider_test.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,7 @@ func testAccPreCheck(t *testing.T) {
3535
if v := os.Getenv("GITHUB_ORGANIZATION"); v == "" {
3636
t.Fatal("GITHUB_ORGANIZATION must be set for acceptance tests")
3737
}
38+
if v := os.Getenv("GITHUB_TEST_USER"); v == "" {
39+
t.Fatal("GITHUB_TEST_USER must be set for acceptance tests")
40+
}
3841
}

builtin/providers/github/resource_github_membership_test.go

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,20 @@ import (
77
"github.com/google/go-github/github"
88
"github.com/hashicorp/terraform/helper/resource"
99
"github.com/hashicorp/terraform/terraform"
10+
"os"
1011
)
1112

1213
func TestAccGithubMembership_basic(t *testing.T) {
1314
var membership github.Membership
1415

16+
testUser := os.Getenv("GITHUB_TEST_USER")
17+
testAccGithubMembershipConfig := fmt.Sprintf(`
18+
resource "github_membership" "test_org_membership" {
19+
username = "%s"
20+
role = "member"
21+
}
22+
`, testUser)
23+
1524
resource.Test(t, resource.TestCase{
1625
PreCheck: func() { testAccPreCheck(t) },
1726
Providers: testAccProviders,
@@ -104,10 +113,3 @@ func testAccCheckGithubMembershipRoleState(n string, membership *github.Membersh
104113
return nil
105114
}
106115
}
107-
108-
const testAccGithubMembershipConfig = `
109-
resource "github_membership" "test_org_membership" {
110-
username = "TerraformDummyUser"
111-
role = "member"
112-
}
113-
`

builtin/providers/github/resource_github_team_membership_test.go

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,49 @@ import (
77
"github.com/google/go-github/github"
88
"github.com/hashicorp/terraform/helper/resource"
99
"github.com/hashicorp/terraform/terraform"
10+
"os"
1011
)
1112

1213
func TestAccGithubTeamMembership_basic(t *testing.T) {
1314
var membership github.Membership
1415

16+
testUser := os.Getenv("GITHUB_TEST_USER")
17+
testAccGithubTeamMembershipConfig := fmt.Sprintf(`
18+
resource "github_membership" "test_org_membership" {
19+
username = "%s"
20+
role = "member"
21+
}
22+
23+
resource "github_team" "test_team" {
24+
name = "foo"
25+
description = "Terraform acc test group"
26+
}
27+
28+
resource "github_team_membership" "test_team_membership" {
29+
team_id = "${github_team.test_team.id}"
30+
username = "%s"
31+
role = "member"
32+
}
33+
`, testUser, testUser)
34+
35+
testAccGithubTeamMembershipUpdateConfig := fmt.Sprintf(`
36+
resource "github_membership" "test_org_membership" {
37+
username = "%s"
38+
role = "member"
39+
}
40+
41+
resource "github_team" "test_team" {
42+
name = "foo"
43+
description = "Terraform acc test group"
44+
}
45+
46+
resource "github_team_membership" "test_team_membership" {
47+
team_id = "${github_team.test_team.id}"
48+
username = "%s"
49+
role = "maintainer"
50+
}
51+
`, testUser, testUser)
52+
1553
resource.Test(t, resource.TestCase{
1654
PreCheck: func() { testAccPreCheck(t) },
1755
Providers: testAccProviders,
@@ -114,39 +152,3 @@ func testAccCheckGithubTeamMembershipRoleState(n, expected string, membership *g
114152
return nil
115153
}
116154
}
117-
118-
const testAccGithubTeamMembershipConfig = `
119-
resource "github_membership" "test_org_membership" {
120-
username = "TerraformDummyUser"
121-
role = "member"
122-
}
123-
124-
resource "github_team" "test_team" {
125-
name = "foo"
126-
description = "Terraform acc test group"
127-
}
128-
129-
resource "github_team_membership" "test_team_membership" {
130-
team_id = "${github_team.test_team.id}"
131-
username = "TerraformDummyUser"
132-
role = "member"
133-
}
134-
`
135-
136-
const testAccGithubTeamMembershipUpdateConfig = `
137-
resource "github_membership" "test_org_membership" {
138-
username = "TerraformDummyUser"
139-
role = "member"
140-
}
141-
142-
resource "github_team" "test_team" {
143-
name = "foo"
144-
description = "Terraform acc test group"
145-
}
146-
147-
resource "github_team_membership" "test_team_membership" {
148-
team_id = "${github_team.test_team.id}"
149-
username = "TerraformDummyUser"
150-
role = "maintainer"
151-
}
152-
`

0 commit comments

Comments
 (0)