Skip to content

Commit

Permalink
chore(project): correct debug log message
Browse files Browse the repository at this point in the history
  • Loading branch information
nikku committed Nov 26, 2018
1 parent 9dcd21b commit 857d127
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion index.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ module.exports = app => {
if (requiredStatusChecks.length) {
context.log.debug('validating merge against branch restrictions');
} else {
context.log.debug('validating merge against via all status checks');
context.log.debug('validating merge against all status checks');
}

const canMerge = requiredStatusChecks.length ? (summary) => {
Expand Down
12 changes: 6 additions & 6 deletions test/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ describe('merge-me', () => {
'checking branch with-pr',
'found 1 pulls',
'checking merge on PR #1',
'validating merge against via all status checks',
'validating merge against all status checks',
'branch status success',
'merged PR #1'
]));
Expand Down Expand Up @@ -296,7 +296,7 @@ describe('merge-me', () => {

it('approval', verify('pullRequestReview.approval', [
'checking merge on PR #4',
'validating merge against via all status checks',
'validating merge against all status checks',
'branch status success',
'merged PR #4'
]));
Expand Down Expand Up @@ -334,7 +334,7 @@ describe('merge-me', () => {

it('with status', verify('pullRequest.synchronize', [
'checking merge on PR #4',
'validating merge against via all status checks',
'validating merge against all status checks',
'branch status success',
'merged PR #4'
]));
Expand All @@ -350,15 +350,15 @@ describe('merge-me', () => {

it('merge fail generic', verify('pullRequest.mergeFail', [
'checking merge on PR #666',
'validating merge against via all status checks',
'validating merge against all status checks',
'branch status success',
'merge failed'
]));


it('merge fail 405', verify('pullRequest.mergeFail.405', [
'checking merge on PR #405',
'validating merge against via all status checks',
'validating merge against all status checks',
'branch status success',
'merge #405 failed: error'
]));
Expand All @@ -384,7 +384,7 @@ describe('merge-me', () => {
'checking merge on PR #5',
'external PR, checking if review(s) exists',
'approved via review(s)',
'validating merge against via all status checks',
'validating merge against all status checks',
'branch status success',
'merged PR #5'
]));
Expand Down

0 comments on commit 857d127

Please sign in to comment.