Update approved requirement documentation to be consistent

This commit is contained in:
John Reese
2020-04-13 09:18:04 -04:00
committed by Luke Kysow
parent e5738341c4
commit 26467c7b66
3 changed files with 3 additions and 3 deletions

View File

@@ -5,7 +5,7 @@
Atlantis allows you to require certain conditions be satisfied **before** an `atlantis apply`
command can be run:
* [Approved](#approved) requires pull requests to be approved by at least one user
* [Approved](#approved) requires pull requests to be approved by at least one user other than the author
* [Mergeable](#mergeable) requires pull requests to be able to be merged
## What Happens If The Requirement Is Not Met?

View File

@@ -234,7 +234,7 @@ func (p *DefaultProjectCommandRunner) doApply(ctx models.ProjectCommandContext)
return "", "", errors.Wrap(err, "checking if pull request was approved")
}
if !approved {
return "", "Pull request must be approved before running apply.", nil
return "", "Pull request must be approved by at least one person other than the author before running apply.", nil
}
case raw.MergeableApplyRequirement:
if !ctx.PullMergeable {

View File

@@ -162,7 +162,7 @@ func TestDefaultProjectCommandRunner_ApplyNotApproved(t *testing.T) {
When(mockApproved.PullIsApproved(ctx.BaseRepo, ctx.Pull)).ThenReturn(false, nil)
res := runner.Apply(ctx)
Equals(t, "Pull request must be approved before running apply.", res.Failure)
Equals(t, "Pull request must be approved by at least one person other than the author before running apply.", res.Failure)
}
// Test that if mergeable is required and the PR isn't mergeable we give an error.