address failing autoplan test with automerge

runatlantis · Jul 10, 2023 · 06ffe01 · 06ffe01
1 parent fb2df20
commit 06ffe01
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/server/events/command_runner_test.go b/server/events/command_runner_test.go
@@ -695,16 +695,17 @@ func TestRunAutoplanCommandWithError_DeletePlans(t *testing.T) {
 	Ok(t, err)
 	dbUpdater.Backend = boltDB
 	applyCommandRunner.Backend = boltDB
-	autoMerger.GlobalAutomerge = true
 	defer func() { autoMerger.GlobalAutomerge = false }()
 
 	When(projectCommandBuilder.BuildAutoplanCommands(Any[*command.Context]())).
 		ThenReturn([]command.ProjectContext{
 			{
-				CommandName: command.Plan,
+				CommandName:      command.Plan,
+				AutomergeEnabled: true, // Setting this manually, since this tests bypasses automerge param reconciliation logic and otherwise defaults to false.
 			},
 			{
-				CommandName: command.Plan,
+				CommandName:      command.Plan,
+				AutomergeEnabled: true, // Setting this manually, since this tests bypasses automerge param reconciliation logic and otherwise defaults to false.
 			},
 		}, nil)
 	callCount := 0