Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Tests broken by #3503 #3583

Merged
merged 1 commit into from
Jul 6, 2023
Merged

fix: Tests broken by #3503 #3583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions server/controllers/events/events_controller_e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -901,10 +901,12 @@ func TestGitHubWorkflowWithPolicyCheck(t *testing.T) {
},
},
{
Description: "failing policy without policies passing and custom run steps",
RepoDir: "policy-checks-custom-run-steps",
ModifiedFiles: []string{"main.tf"},
ExpAutoplan: true,
Description: "failing policy without policies passing and custom run steps",
RepoDir: "policy-checks-custom-run-steps",
ModifiedFiles: []string{"main.tf"},
PolicyCheck: true,
ExpAutoplan: true,
ExpPolicyChecks: true,
Comments: []string{
"atlantis apply",
},
Expand Down Expand Up @@ -1160,10 +1162,10 @@ func TestGitHubWorkflowWithPolicyCheck(t *testing.T) {
expNumReplies--
}

_, _, actReplies, _ := vcsClient.VerifyWasCalled(Times(expNumReplies)).CreateComment(Any[models.Repo](), Any[int](), Any[string](), Any[string]()).GetAllCapturedArguments()
if !c.ExpPolicyChecks {
expNumReplies--
}
_, _, actReplies, _ := vcsClient.VerifyWasCalled(Times(expNumReplies)).CreateComment(Any[models.Repo](), Any[int](), Any[string](), Any[string]()).GetAllCapturedArguments()

Assert(t, len(c.ExpReplies) == len(actReplies), "missing expected replies, got %d but expected %d", len(actReplies), len(c.ExpReplies))
for i, expReply := range c.ExpReplies {
Expand Down
21 changes: 11 additions & 10 deletions server/events/project_command_builder_internal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -989,9 +989,9 @@ repos:
},
Pull: pull,
ProjectName: "",
PlanRequirements: []string{},
ApplyRequirements: []string{},
ImportRequirements: []string{},
PlanRequirements: []string{"policies_passed"},
ApplyRequirements: []string{"policies_passed"},
ImportRequirements: []string{"policies_passed"},
RePlanCmd: "atlantis plan -d project1 -w myworkspace -- flag",
RepoRelDir: "project1",
User: models.User{},
Expand Down Expand Up @@ -1051,13 +1051,13 @@ workflows:
},
Pull: pull,
ProjectName: "",
PlanRequirements: []string{},
PlanRequirements: []string{"policies_passed"},
ApplyRequirements: []string{},
ImportRequirements: []string{},
ImportRequirements: []string{"policies_passed"},
RepoConfigVersion: 3,
RePlanCmd: "atlantis plan -d project1 -w myworkspace -- flag",
RepoRelDir: "project1",
TerraformVersion: mustVersion("10.0"),
TerraformVersion: mustVersion("v10.0"),
User: models.User{},
Verbose: true,
Workspace: "myworkspace",
Expand Down Expand Up @@ -1092,10 +1092,11 @@ workflows:
Ok(t, os.WriteFile(globalCfgPath, []byte(c.globalCfg), 0600))
parser := &config.ParserValidator{}
globalCfgArgs := valid.GlobalCfgArgs{
AllowRepoCfg: false,
MergeableReq: false,
ApprovedReq: false,
UnDivergedReq: false,
AllowRepoCfg: false,
MergeableReq: false,
ApprovedReq: false,
UnDivergedReq: false,
PolicyCheckEnabled: true,
}

globalCfg, err := parser.ParseGlobalCfg(globalCfgPath, valid.NewGlobalCfgFromArgs(globalCfgArgs))
Expand Down
9 changes: 5 additions & 4 deletions server/events/project_command_builder_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1398,10 +1398,11 @@ func TestDefaultProjectCommandBuilder_WithPolicyCheckEnabled_BuildAutoplanComman
When(vcsClient.GetModifiedFiles(Any[models.Repo](), Any[models.PullRequest]())).ThenReturn([]string{"main.tf"}, nil)

globalCfgArgs := valid.GlobalCfgArgs{
AllowRepoCfg: false,
MergeableReq: false,
ApprovedReq: false,
UnDivergedReq: false,
AllowRepoCfg: false,
MergeableReq: false,
ApprovedReq: false,
UnDivergedReq: false,
PolicyCheckEnabled: true,
}

globalCfg := valid.NewGlobalCfgFromArgs(globalCfgArgs)
Expand Down