Skip to content
This repository was archived by the owner on Feb 11, 2022. It is now read-only.

Commit 3120615

Browse files
committed
fix(greenkeeper-url): updated to match the new expected url
1 parent 219b818 commit 3120615

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

src/greenkeeper.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
export const GREENKEEPER_BOT_GITHUB_URL = 'https://github.com/greenkeeperio-bot';
1+
export const GREENKEEPER_BOT_GITHUB_URL = 'https://github.com/marketplace/greenkeeper';
22
export const GREENKEEPER_INTEGRATION_GITHUB_URL = 'https://github.com/apps/greenkeeper';
33

44
export default function (sender) {

src/handler.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,13 @@ export default async function (request, responseToolkit, settings) {
5454
return responseToolkit.response(boom.internal('too many PRs exist for this commit'));
5555
}
5656

57-
if (openedByGreenkeeperBot(pullRequests[0].user.html_url)) {
57+
const senderUrl = pullRequests[0].user.html_url;
58+
if (openedByGreenkeeperBot(senderUrl)) {
5859
process(request, await getPullRequest(repository, pullRequests[0].number), settings);
5960
return responseToolkit.response('ok').code(ACCEPTED);
6061
}
6162

62-
return responseToolkit.response('PR is not from greenkeeper').code(BAD_REQUEST);
63+
return responseToolkit.response(`PR is not from greenkeeper, but from ${senderUrl}`).code(BAD_REQUEST);
6364
})
6465
.catch(e => boom.internal('failed to fetch PRs', e));
6566
}

test/unit/greenkeeper-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import openedByGreenkeeperBot, {
66

77
suite('greenkeeper', () => {
88
test('that the users are defined to match the greenkeeper bots', () => {
9-
assert.equal(GREENKEEPER_BOT_GITHUB_URL, 'https://github.com/greenkeeperio-bot');
9+
assert.equal(GREENKEEPER_BOT_GITHUB_URL, 'https://github.com/marketplace/greenkeeper');
1010
assert.equal(GREENKEEPER_INTEGRATION_GITHUB_URL, 'https://github.com/apps/greenkeeper');
1111
});
1212

test/unit/handler-test.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,14 @@ suite('handler', () => {
178178
});
179179

180180
test('that the response is bad-request if the PR is not from greenkeeper', () => {
181+
const senderUrl = any.url();
181182
const request = {
182183
payload: {state: 'success', branches: [{name: any.string()}]},
183184
headers: {'x-github-event': 'status'},
184185
log: () => undefined
185186
};
186-
getPullRequestsForCommit.resolves([{user: {html_url: any.url()}}]);
187-
response.withArgs('PR is not from greenkeeper').returns({code});
187+
getPullRequestsForCommit.resolves([{user: {html_url: senderUrl}}]);
188+
response.withArgs(`PR is not from greenkeeper, but from ${senderUrl}`).returns({code});
188189

189190
return handler(request, {response}, settings).then(() => assert.calledWith(code, BAD_REQUEST));
190191
});

0 commit comments

Comments
 (0)