Skip to content
This repository has been archived by the owner on Aug 14, 2024. It is now read-only.

Commit

Permalink
Merge pull request #259 from CKarper/master
Browse files Browse the repository at this point in the history
Change owner to proposer for whitelist checks
  • Loading branch information
CKarper authored Apr 24, 2018
2 parents ffcac87 + 4dab244 commit da3b2bc
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
16 changes: 8 additions & 8 deletions lib/reviewer.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ class Reviewer {
}

renderComment(results, state) {
const { isOwnerWhitelisted, owner, ...remain } = state;
const { isProposerWhitelisted, proposer, ...remain } = state;
const stateMd = this.renderCommentState(remain);

const body = isOwnerWhitelisted ?
`@${owner} is whitelisted, no review required.` :
const body = isProposerWhitelisted ?
`@${proposer} is whitelisted, no review required.` :
results.map(({ comment }) => comment).join('');

return dedent`${stateMd}
Expand Down Expand Up @@ -171,11 +171,11 @@ class Reviewer {
const previousComment = [...shaComments].pop();

const whitelist = this.config('users_whitelist');
const isOwnerWhitelisted = whitelist && whitelist.includes(pr.owner);
const isProposerWhitelisted = whitelist && whitelist.includes(pr.proposer);

const providers = isOwnerWhitelisted ? [] : await this.prepareProviders();
const providers = isProposerWhitelisted ? [] : await this.prepareProviders();

if (!isOwnerWhitelisted && providers.length === 0) {
if (!isProposerWhitelisted && providers.length === 0) {
this.log.warn('No providers run.');
return pr;
}
Expand All @@ -198,8 +198,8 @@ class Reviewer {
const newState = {
sha: pr.sha,
providers: instances.map(({ name }) => name),
owner: pr.owner,
isOwnerWhitelisted,
proposer: pr.proposer,
isProposerWhitelisted,
};

const newBody = this.renderComment(results, newState).trim();
Expand Down
2 changes: 1 addition & 1 deletion lib/reviewer.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ test('Reviewer.review - whitelisted user', async t => {

const providers = { test_provider: TestProvider };
const config = createTestConfig({
users_whitelist: ['paultyng'],
users_whitelist: ['proposer'],
review: {
test_provider: true,
},
Expand Down

0 comments on commit da3b2bc

Please sign in to comment.