Adds a teardown function to playbook server tests to disable and reen…

…able boards
grommunio · Mar 16, 2023 · 9a46e3d · 9a46e3d
1 parent 787044a
commit 9a46e3d
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 53 deletions.
diff --git a/server/playbooks/server/api_actions_test.go b/server/playbooks/server/api_actions_test.go
@@ -15,7 +15,8 @@ import (
 )
 
 func TestActionCreation(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	createNewChannel := func(t *testing.T, name string) *model.Channel {
@@ -200,7 +201,8 @@ func TestActionCreation(t *testing.T) {
 }
 
 func TestActionList(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	// Create three valid actions
@@ -292,7 +294,8 @@ func TestActionList(t *testing.T) {
 }
 
 func TestActionUpdate(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	// Create a valid action

diff --git a/server/playbooks/server/api_bot_test.go b/server/playbooks/server/api_bot_test.go
@@ -13,7 +13,8 @@ import (
 )
 
 func TestTrialLicences(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("request trial license without permissions", func(t *testing.T) {

diff --git a/server/playbooks/server/api_general_test.go b/server/playbooks/server/api_general_test.go
@@ -11,7 +11,8 @@ import (
 )
 
 func TestAPI(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 
 	t.Run("404", func(t *testing.T) {

diff --git a/server/playbooks/server/api_graphql_playbooks_test.go b/server/playbooks/server/api_graphql_playbooks_test.go
@@ -21,7 +21,8 @@ import (
 )
 
 func TestGraphQLPlaybooks(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("basic get", func(t *testing.T) {
@@ -205,7 +206,8 @@ func TestGraphQLPlaybooks(t *testing.T) {
 
 }
 func TestGraphQLUpdatePlaybookFails(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("update playbook fails because size constraints.", func(t *testing.T) {
@@ -368,7 +370,8 @@ func TestGraphQLUpdatePlaybookFails(t *testing.T) {
 }
 
 func TestUpdatePlaybookFavorite(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("favorite", func(t *testing.T) {
@@ -490,7 +493,8 @@ func gqlTestPlaybookUpdate(e *TestEnvironment, t *testing.T, playbookID string,
 }
 
 func TestGraphQLPlaybooksMetrics(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("metrics get", func(t *testing.T) {

diff --git a/server/playbooks/server/api_graphql_runs_test.go b/server/playbooks/server/api_graphql_runs_test.go
@@ -19,7 +19,8 @@ import (
 )
 
 func TestGraphQLRunList(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("list by participantOrFollower", func(t *testing.T) {
@@ -204,7 +205,8 @@ func TestGraphQLRunList(t *testing.T) {
 }
 
 func TestGraphQLChangeRunParticipants(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	user3, _, err := e.ServerAdminClient.CreateUser(&model.User{
@@ -656,7 +658,8 @@ func TestGraphQLChangeRunParticipants(t *testing.T) {
 }
 
 func TestGraphQLChangeRunOwner(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	// create a third user to test change owner
@@ -699,7 +702,8 @@ func TestGraphQLChangeRunOwner(t *testing.T) {
 }
 
 func TestSetRunFavorite(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	createRun := func() *client.PlaybookRun {
@@ -785,7 +789,8 @@ func TestSetRunFavorite(t *testing.T) {
 }
 
 func TestResolverFavorites(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	createRun := func() *client.PlaybookRun {
@@ -817,7 +822,8 @@ func TestResolverFavorites(t *testing.T) {
 }
 
 func TestResolverPlaybooks(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	createRun := func() *client.PlaybookRun {
@@ -843,7 +849,8 @@ func TestResolverPlaybooks(t *testing.T) {
 }
 
 func TestUpdateRun(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	createRun := func() *client.PlaybookRun {
@@ -959,7 +966,8 @@ func TestUpdateRun(t *testing.T) {
 }
 
 func TestUpdateRunTaskActions(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("task actions mutation create and update", func(t *testing.T) {
@@ -1052,7 +1060,8 @@ func TestUpdateRunTaskActions(t *testing.T) {
 }
 
 func TestBadGraphQLRequest(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	testRunsQuery := `

diff --git a/server/playbooks/server/api_playbooks_test.go b/server/playbooks/server/api_playbooks_test.go
@@ -21,7 +21,8 @@ import (
 )
 
 func TestPlaybooks(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 
@@ -265,7 +266,8 @@ func TestPlaybooks(t *testing.T) {
 }
 
 func TestCreateInvalidPlaybook(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 
@@ -366,7 +368,8 @@ func TestCreateInvalidPlaybook(t *testing.T) {
 }
 
 func TestPlaybooksRetrieval(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("get playbook", func(t *testing.T) {
@@ -383,7 +386,8 @@ func TestPlaybooksRetrieval(t *testing.T) {
 }
 
 func TestPlaybookUpdate(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("update playbook properties", func(t *testing.T) {
@@ -516,7 +520,8 @@ func TestPlaybookUpdate(t *testing.T) {
 }
 
 func TestPlaybookUpdateCrossTeam(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("update playbook properties not in team public playbook", func(t *testing.T) {
@@ -546,7 +551,8 @@ func TestPlaybookUpdateCrossTeam(t *testing.T) {
 }
 
 func TestPlaybooksSort(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 	e.SetE20Licence()
@@ -788,7 +794,8 @@ func TestPlaybooksSort(t *testing.T) {
 }
 
 func TestPlaybooksPaging(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 	e.SetE20Licence()
@@ -927,7 +934,8 @@ func getPlaybookIDsList(playbooks []client.Playbook) []string {
 }
 
 func TestPlaybooksPermissions(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("test no permissions to create", func(t *testing.T) {
@@ -1139,7 +1147,8 @@ func TestPlaybooksPermissions(t *testing.T) {
 }
 
 func TestPlaybooksConversions(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("public to private conversion", func(t *testing.T) {
@@ -1198,7 +1207,8 @@ func TestPlaybooksConversions(t *testing.T) {
 }
 
 func TestPlaybooksImportExport(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 	e.CreateBasicPublicPlaybook()
@@ -1226,7 +1236,8 @@ func TestPlaybooksImportExport(t *testing.T) {
 }
 
 func TestPlaybooksDuplicate(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 	e.SetE20Licence()
@@ -1247,7 +1258,8 @@ func TestPlaybooksDuplicate(t *testing.T) {
 }
 
 func TestAddPostToTimeline(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	dialogRequest := model.SubmitDialogRequest{
@@ -1294,7 +1306,8 @@ func TestAddPostToTimeline(t *testing.T) {
 }
 
 func TestPlaybookStats(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateClients()
 	e.CreateBasicServer()
 	e.SetE20Licence()
@@ -1329,7 +1342,8 @@ func TestPlaybookStats(t *testing.T) {
 }
 
 func TestPlaybookGetAutoFollows(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	p1ID, err := e.PlaybooksAdminClient.Playbooks.Create(context.Background(), client.PlaybookCreateOptions{
@@ -1432,7 +1446,8 @@ func TestPlaybookGetAutoFollows(t *testing.T) {
 }
 
 func TestPlaybookChecklistCleanup(t *testing.T) {
-	e := Setup(t)
+	e, teardown := Setup(t)
+	defer teardown()
 	e.CreateBasic()
 
 	t.Run("update playbook", func(t *testing.T) {