diff options
author | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-11 18:18:44 +0300 |
---|---|---|
committer | Tim Zallmann <tzallmann@gitlab.com> | 2018-10-11 18:18:44 +0300 |
commit | a8513c7dc306aee838074bdd01c1999d8c19f4c3 (patch) | |
tree | b2d01799b91dd1dfb6041ce71fec35a8f0fbfac8 /spec | |
parent | 2343dd8dd6ef6c74511e34808377b7dc5fe8c25b (diff) | |
parent | 8bc33c789443550ce2f0d75cf8477e1aae204538 (diff) |
Merge branch '52472-pipeline-endpoint-json' into 'master'
Adds `.json` to the end of pipelines endpoint
Closes #52472
See merge request gitlab-org/gitlab-ce!22293
Diffstat (limited to 'spec')
-rw-r--r-- | spec/javascripts/jobs/store/actions_spec.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/jobs/store/actions_spec.js b/spec/javascripts/jobs/store/actions_spec.js index 5ab1f75d0d6..ce07effba9e 100644 --- a/spec/javascripts/jobs/store/actions_spec.js +++ b/spec/javascripts/jobs/store/actions_spec.js @@ -422,7 +422,7 @@ describe('Job State actions', () => { beforeEach(() => { mockedState.job.pipeline = { - path: `${TEST_HOST}/endpoint.json/stages`, + path: `${TEST_HOST}/endpoint`, }; mock = new MockAdapter(axios); }); @@ -434,7 +434,7 @@ describe('Job State actions', () => { describe('success', () => { it('dispatches requestStages and receiveStagesSuccess, fetchJobsForStage ', done => { mock - .onGet(`${TEST_HOST}/endpoint.json/stages`) + .onGet(`${TEST_HOST}/endpoint.json`) .replyOnce(200, { details: { stages: [{ id: 121212, name: 'build' }] } }); testAction( |