Skip to content

Commit 776384e

Browse files
wahapowahapo
authoredOct 13, 2020
1 parent 5b873d5 commit 776384e

File tree

6 files changed

+25
-25
lines changed

6 files changed

+25
-25
lines changed
 

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
"screwdriver-executor-queue": "^3.0.0",
112112
"screwdriver-executor-router": "^2.0.0",
113113
"screwdriver-logger": "^1.0.1",
114-
"screwdriver-models": "^28.0.0",
114+
"screwdriver-models": "^28.3.0",
115115
"screwdriver-notifications-email": "^2.0.0",
116116
"screwdriver-notifications-slack": "^3.0.0",
117117
"screwdriver-scm-base": "^7.0.0",

‎plugins/pipelines/create.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ module.exports = () => ({
115115

116116
const results = await Promise.all([
117117
pipeline.sync(),
118-
pipeline.addWebhook(`${request.server.info.uri}/v4/webhooks`)
118+
pipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`)
119119
]);
120120

121121
const location = urlLib.format({

‎plugins/pipelines/syncWebhooks.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ module.exports = () => ({
5151
}
5252
})
5353
// user has good permissions, add or update webhooks
54-
.then(() => pipeline.addWebhook(`${request.server.info.uri}/v4/webhooks`))
54+
.then(() => pipeline.addWebhooks(`${request.server.info.uri}/v4/webhooks`))
5555
.then(() => h.response().code(204))
5656
);
5757
})

‎plugins/pipelines/update.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ module.exports = () => ({
140140
.then(updatedPipeline =>
141141
Promise.all([
142142
updatedPipeline.sync(),
143-
updatedPipeline.addWebhook(
143+
updatedPipeline.addWebhooks(
144144
`${request.server.info.uri}/v4/webhooks`
145145
)
146146
])

‎test/plugins/caches.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const decoratePipelineMock = pipeline => {
1515
const mock = hoek.clone(pipeline);
1616

1717
mock.sync = sinon.stub();
18-
mock.addWebhook = sinon.stub();
18+
mock.addWebhooks = sinon.stub();
1919
mock.syncPRs = sinon.stub();
2020
mock.update = sinon.stub();
2121
mock.toJson = sinon.stub().returns(pipeline);

‎test/plugins/pipelines.test.js

+20-20
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const decoratePipelineMock = pipeline => {
7979
const mock = hoek.clone(pipeline);
8080

8181
mock.sync = sinon.stub();
82-
mock.addWebhook = sinon.stub();
82+
mock.addWebhooks = sinon.stub();
8383
mock.syncPRs = sinon.stub();
8484
mock.update = sinon.stub();
8585
mock.toJson = sinon.stub().returns(pipeline);
@@ -1304,7 +1304,7 @@ describe('pipeline plugin test', () => {
13041304
});
13051305

13061306
it('returns 500 when model returns an error', () => {
1307-
pipelineMock.addWebhook.rejects(new Error('icantdothatdave'));
1307+
pipelineMock.addWebhooks.rejects(new Error('icantdothatdave'));
13081308

13091309
return server.inject(options).then(reply => {
13101310
assert.equal(reply.statusCode, 500);
@@ -1436,7 +1436,7 @@ describe('pipeline plugin test', () => {
14361436

14371437
pipelineMock = getPipelineMocks(testPipeline);
14381438
pipelineMock.sync.resolves(pipelineMock);
1439-
pipelineMock.addWebhook.resolves(null);
1439+
pipelineMock.addWebhooks.resolves(null);
14401440

14411441
pipelineFactoryMock.get.resolves(null);
14421442
pipelineFactoryMock.create.resolves(pipelineMock);
@@ -1653,7 +1653,7 @@ describe('pipeline plugin test', () => {
16531653
})
16541654
.resolves([getCollectionMock(testDefaultCollection)]);
16551655

1656-
pipelineMock.addWebhook.rejects(testError);
1656+
pipelineMock.addWebhooks.rejects(testError);
16571657

16581658
return server.inject(options).then(reply => {
16591659
assert.equal(reply.statusCode, 500);
@@ -1704,7 +1704,7 @@ describe('pipeline plugin test', () => {
17041704

17051705
pipelineMock = getPipelineMocks(testPipeline);
17061706
updatedPipelineMock = hoek.clone(pipelineMock);
1707-
updatedPipelineMock.addWebhook.resolves(null);
1707+
updatedPipelineMock.addWebhooks.resolves(null);
17081708

17091709
pipelineFactoryMock.get.withArgs({ id }).resolves(pipelineMock);
17101710
pipelineFactoryMock.get.withArgs({ scmUri }).resolves(null);
@@ -1719,7 +1719,7 @@ describe('pipeline plugin test', () => {
17191719
it('returns 200 and correct pipeline data', () =>
17201720
server.inject(options).then(reply => {
17211721
assert.calledOnce(pipelineMock.update);
1722-
assert.calledOnce(updatedPipelineMock.addWebhook);
1722+
assert.calledOnce(updatedPipelineMock.addWebhooks);
17231723
assert.equal(reply.statusCode, 200);
17241724
}));
17251725

@@ -1733,7 +1733,7 @@ describe('pipeline plugin test', () => {
17331733

17341734
return server.inject(options).then(reply => {
17351735
assert.calledOnce(pipelineMock.update);
1736-
assert.calledOnce(updatedPipelineMock.addWebhook);
1736+
assert.calledOnce(updatedPipelineMock.addWebhooks);
17371737
assert.equal(reply.statusCode, 200);
17381738
});
17391739
});
@@ -1790,7 +1790,7 @@ describe('pipeline plugin test', () => {
17901790
pipelineFactoryMock.get.withArgs({ id }).resolves(null);
17911791

17921792
return server.inject(options).then(reply => {
1793-
assert.notCalled(updatedPipelineMock.addWebhook);
1793+
assert.notCalled(updatedPipelineMock.addWebhooks);
17941794
assert.equal(reply.statusCode, 404);
17951795
});
17961796
});
@@ -1799,7 +1799,7 @@ describe('pipeline plugin test', () => {
17991799
pipelineMock.configPipelineId = 123;
18001800

18011801
return server.inject(options).then(reply => {
1802-
assert.notCalled(updatedPipelineMock.addWebhook);
1802+
assert.notCalled(updatedPipelineMock.addWebhooks);
18031803
assert.equal(reply.statusCode, 403);
18041804
});
18051805
});
@@ -1808,7 +1808,7 @@ describe('pipeline plugin test', () => {
18081808
userMock.getPermissions.withArgs(scmUri).resolves({ admin: false });
18091809

18101810
return server.inject(options).then(reply => {
1811-
assert.notCalled(updatedPipelineMock.addWebhook);
1811+
assert.notCalled(updatedPipelineMock.addWebhooks);
18121812
assert.equal(reply.statusCode, 403);
18131813
});
18141814
});
@@ -1817,7 +1817,7 @@ describe('pipeline plugin test', () => {
18171817
userMock.getPermissions.withArgs(oldScmUri).resolves({ admin: false });
18181818

18191819
return server.inject(options).then(reply => {
1820-
assert.notCalled(updatedPipelineMock.addWebhook);
1820+
assert.notCalled(updatedPipelineMock.addWebhooks);
18211821
assert.equal(reply.statusCode, 403);
18221822
});
18231823
});
@@ -1830,7 +1830,7 @@ describe('pipeline plugin test', () => {
18301830
// Only call once to get permissions on the new repo
18311831
assert.calledOnce(userMock.getPermissions);
18321832
assert.calledWith(userMock.getPermissions, scmUri);
1833-
assert.calledOnce(updatedPipelineMock.addWebhook);
1833+
assert.calledOnce(updatedPipelineMock.addWebhooks);
18341834
assert.equal(reply.statusCode, 200);
18351835
});
18361836
});
@@ -1843,7 +1843,7 @@ describe('pipeline plugin test', () => {
18431843
// Only call once to get permissions on the new repo
18441844
assert.calledOnce(userMock.getPermissions);
18451845
assert.calledWith(userMock.getPermissions, scmUri);
1846-
assert.notCalled(updatedPipelineMock.addWebhook);
1846+
assert.notCalled(updatedPipelineMock.addWebhooks);
18471847
assert.equal(reply.statusCode, 403);
18481848
});
18491849
});
@@ -1857,7 +1857,7 @@ describe('pipeline plugin test', () => {
18571857
};
18581858

18591859
return server.inject(options).then(reply => {
1860-
assert.notCalled(updatedPipelineMock.addWebhook);
1860+
assert.notCalled(updatedPipelineMock.addWebhooks);
18611861
assert.equal(reply.statusCode, 401);
18621862
});
18631863
});
@@ -1867,7 +1867,7 @@ describe('pipeline plugin test', () => {
18671867

18681868
return server.inject(options).then(reply => {
18691869
assert.equal(reply.statusCode, 409);
1870-
assert.notCalled(updatedPipelineMock.addWebhook);
1870+
assert.notCalled(updatedPipelineMock.addWebhooks);
18711871
assert.strictEqual(reply.result.message, `Pipeline already exists with the ID: ${pipelineMock.id}`);
18721872
});
18731873
});
@@ -1878,7 +1878,7 @@ describe('pipeline plugin test', () => {
18781878
pipelineFactoryMock.get.withArgs({ id }).rejects(testError);
18791879

18801880
return server.inject(options).then(reply => {
1881-
assert.notCalled(updatedPipelineMock.addWebhook);
1881+
assert.notCalled(updatedPipelineMock.addWebhooks);
18821882
assert.equal(reply.statusCode, 500);
18831883
});
18841884
});
@@ -1889,7 +1889,7 @@ describe('pipeline plugin test', () => {
18891889
pipelineMock.update.rejects(testError);
18901890

18911891
return server.inject(options).then(reply => {
1892-
assert.notCalled(updatedPipelineMock.addWebhook);
1892+
assert.notCalled(updatedPipelineMock.addWebhooks);
18931893
assert.equal(reply.statusCode, 500);
18941894
});
18951895
});
@@ -1900,18 +1900,18 @@ describe('pipeline plugin test', () => {
19001900
pipelineMock.sync.rejects(testError);
19011901

19021902
return server.inject(options).then(reply => {
1903-
assert.calledOnce(updatedPipelineMock.addWebhook);
1903+
assert.calledOnce(updatedPipelineMock.addWebhooks);
19041904
assert.equal(reply.statusCode, 500);
19051905
});
19061906
});
19071907

19081908
it('returns 500 when the pipeline model fails to add webhooks during create', () => {
19091909
const testError = new Error('pipelineModelAddWebhookError');
19101910

1911-
updatedPipelineMock.addWebhook.rejects(testError);
1911+
updatedPipelineMock.addWebhooks.rejects(testError);
19121912

19131913
return server.inject(options).then(reply => {
1914-
assert.calledOnce(updatedPipelineMock.addWebhook);
1914+
assert.calledOnce(updatedPipelineMock.addWebhooks);
19151915
assert.equal(reply.statusCode, 500);
19161916
});
19171917
});

0 commit comments

Comments
 (0)