Rename test resources for easier debugging

Signed-off-by: Timo Sand <[email protected]>

Author: deiga

github/resource_github_organization_ruleset_test.go

@@ -230,8 +230,9 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 	})
 
 	t.Run("Imports rulesets without error", func(t *testing.T) {
+		resourceName := "test-import-rulesets"
 		config := fmt.Sprintf(`
-			resource "github_organization_ruleset" "test" {
+			resource "github_organization_ruleset" "%s" {
 				name        = "test-%s"
 				target      = "branch"
 				enforcement = "active"
@@ -258,6 +259,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 					required_signatures = false
 
 					pull_request {
+            allowed_merge_methods = ["merge", "squash", "rebase"]
 						required_approving_review_count   = 2
 						required_review_thread_resolution = true
 						require_code_owner_review         = true
@@ -285,10 +287,10 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 					non_fast_forward = true
 				}
 			}
-		`, randomID)
+		`, resourceName, randomID)
 
 		check := resource.ComposeTestCheckFunc(
-			resource.TestCheckResourceAttrSet("github_organization_ruleset.test", "name"),
+			resource.TestCheckResourceAttrSet(fmt.Sprintf("github_organization_ruleset.%s", resourceName), "name"),
 		)
 
 		testCase := func(t *testing.T, mode string) {
@@ -301,7 +303,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 						Check:  check,
 					},
 					{
-						ResourceName:      "github_organization_ruleset.test",
+						ResourceName:      fmt.Sprintf("github_organization_ruleset.%s", resourceName),
 						ImportState:       true,
 						ImportStateVerify: true,
 					},
@@ -688,8 +690,9 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 	})
 
 	t.Run("Validates push target rejects ref_name", func(t *testing.T) {
+		resourceName := "test-push-reject-ref-name"
 		config := fmt.Sprintf(`
-			resource "github_organization_ruleset" "test" {
+			resource "github_organization_ruleset" "%s" {
 				name        = "test-push-with-ref-%s"
 				target      = "push"
 				enforcement = "active"
@@ -709,7 +712,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 					creation = true
 				}
 			}
-		`, randomID)
+		`, resourceName, randomID)
 
 		testCase := func(t *testing.T, mode string) {
 			resource.Test(t, resource.TestCase{
@@ -734,8 +737,9 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 	})
 
 	t.Run("Validates repository target rejects ref_name", func(t *testing.T) {
+		resourceName := "test-repository-reject-ref-name"
 		config := fmt.Sprintf(`
-			resource "github_organization_ruleset" "test" {
+			resource "github_organization_ruleset" "%s" {
 				name        = "test-repo-with-ref-%s"
 				target      = "repository"
 				enforcement = "active"
@@ -755,7 +759,7 @@ func TestGithubOrganizationRulesets(t *testing.T) {
 					creation = true
 				}
 			}
-		`, randomID)
+		`, resourceName, randomID)
 
 		testCase := func(t *testing.T, mode string) {
 			resource.Test(t, resource.TestCase{