Fix and refactor TestAccountBetaPrograms

test/integration/account_betas_test.go

@@ -7,44 +7,39 @@ import (
 	"github.com/linode/linodego"
 )
 
-func TestAccountBetaPrograms_List(t *testing.T) {
-	client, teardown := createTestClient(t, "fixtures/TestAccountBetaPrograms_List")
+func TestAccountBetaPrograms(t *testing.T) {
+	client, teardown := createTestClient(t, "fixtures/TestAccountBetaPrograms")
 	defer teardown()
 
-	betas, err := client.ListAccountBetaPrograms(context.Background(), &linodego.ListOptions{})
-	if err != nil {
-		t.Errorf("Error getting Account Beta programs, expected struct, got error %v", err)
-	}
+	betas, err := client.ListBetaPrograms(context.Background(), linodego.NewListOptions(1, ""))
 
 	if len(betas) == 0 {
-		t.Errorf("Expected to see account beta program returned.")
-	} else {
-		assertDateSet(t, betas[0].Enrolled)
+		t.Log("No beta program is available during the test.")
+		return
 	}
-}
-
-func TestAccountBetaProgram_Get(t *testing.T) {
-	client, teardown := createTestClient(t, "fixtures/TestAccountBetaProgram_Get")
-	defer teardown()
+	createOpts := linodego.AccountBetaProgramCreateOpts{ID: betas[0].ID}
 
-	betaID := "cool-beta"
-
-	// Enroll the account into a beta program.
-	createOpts := linodego.AccountBetaProgramCreateOpts{ID: betaID}
-
-	_, err := client.JoinBetaProgram(context.Background(), createOpts)
+	_, err = client.JoinBetaProgram(context.Background(), createOpts)
 	if err != nil {
 		t.Errorf("Error joining a Beta program, expected struct, got error %v", err)
 	}
 
-	beta, err := client.GetAccountBetaProgram(context.Background(), betaID)
-
+	accountBetas, err := client.ListAccountBetaPrograms(context.Background(), &linodego.ListOptions{})
 	if err != nil {
-		t.Errorf("Error getting an Account Beta program, expected struct, got error %v", err)
+		t.Errorf("Error getting Account Beta programs, expected struct, got error %v", err)
 	}
 
-	if beta.ID != betaID {
-		t.Errorf("expected beta ID to be %s; got %s", betaID, beta.ID)
+	if len(accountBetas) == 0 {
+		t.Errorf("Expected to see account beta program returned.")
+	} else {
+		assertDateSet(t, accountBetas[0].Enrolled)
+		betaID := accountBetas[0].ID
+		beta, err := client.GetAccountBetaProgram(context.Background(), betaID)
+		if err != nil {
+			t.Errorf("Error getting an Account Beta program, expected struct, got error %v", err)
+		}
+		if beta.ID != betaID {
+			t.Errorf("expected beta ID to be %s; got %s", betaID, beta.ID)
+		}
 	}
-
 }