summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-12-19 12:22:11 +0100
committerTim Zallmann <tzallmann@gitlab.com>2017-12-19 12:26:02 +0100
commit491aac4a93f55d89b92e8809bd9dd64a881f91d9 (patch)
treed0b44e8cd7bfac5c3de26cf426e05f1a4dec46cb /spec
parented5e0d6b9ede2b3f4681dff8dc6f2d9df344d3c8 (diff)
downloadgitlab-ce-tz-basic-ide-setup.tar.gz
Diffstat (limited to 'spec')
-rw-r--r--spec/javascripts/repo/stores/actions_spec.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/javascripts/repo/stores/actions_spec.js b/spec/javascripts/repo/stores/actions_spec.js
index dfa3d47d4e5..0b0d34f072a 100644
--- a/spec/javascripts/repo/stores/actions_spec.js
+++ b/spec/javascripts/repo/stores/actions_spec.js
@@ -230,7 +230,7 @@ describe('Multi-file store actions', () => {
store.state.currentProjectId = 'abcproject';
store.state.currentBranchId = 'master';
store.state.projects.abcproject = {
- new_merge_request_path: 'newMergeRequestUrl?branch=',
+ web_url: 'webUrl',
branches: {
master: {
workingReference: '1',
@@ -327,7 +327,7 @@ describe('Multi-file store actions', () => {
store.dispatch('commitChanges', { payload, newMr: true })
.then(() => {
- expect(urlUtils.visitUrl).toHaveBeenCalledWith('newMergeRequestUrl?branch=master');
+ expect(urlUtils.visitUrl).toHaveBeenCalledWith('webUrl/merge_requests/new?merge_request%5Bsource_branch%5D=master');
done();
}).catch(done.fail);