diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 18:08:22 +0000 |
commit | 123c68a7cf788ace140e57e478a12c5b7ac893ae (patch) | |
tree | b36e565ecd895ee46c1713f3734308cfce0e6ba9 /spec/javascripts | |
parent | 862d225ca0d8eb452e56b8fe5a0109aac796e872 (diff) | |
download | gitlab-ce-123c68a7cf788ace140e57e478a12c5b7ac893ae.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts')
5 files changed, 25 insertions, 23 deletions
diff --git a/spec/javascripts/ide/stores/modules/commit/actions_spec.js b/spec/javascripts/ide/stores/modules/commit/actions_spec.js index cbc2401262f..557244e237e 100644 --- a/spec/javascripts/ide/stores/modules/commit/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/commit/actions_spec.js @@ -461,7 +461,7 @@ describe('IDE commit module actions', () => { .dispatch('commit/commitChanges') .then(() => { expect(visitUrl).toHaveBeenCalledWith( - `webUrl/merge_requests/new?merge_request[source_branch]=${ + `webUrl/-/merge_requests/new?merge_request[source_branch]=${ store.getters['commit/placeholderBranchName'] }&merge_request[target_branch]=master&nav_source=webide`, ); diff --git a/spec/javascripts/jobs/components/stages_dropdown_spec.js b/spec/javascripts/jobs/components/stages_dropdown_spec.js index e091aece564..f1a01530104 100644 --- a/spec/javascripts/jobs/components/stages_dropdown_spec.js +++ b/spec/javascripts/jobs/components/stages_dropdown_spec.js @@ -27,7 +27,7 @@ describe('Stages Dropdown', () => { }, merge_request: { iid: 1234, - path: '/root/detached-merge-request-pipelines/merge_requests/1', + path: '/root/detached-merge-request-pipelines/-/merge_requests/1', title: 'Update README.md', source_branch: 'feature-1234', source_branch_path: '/root/detached-merge-request-pipelines/branches/feature-1234', diff --git a/spec/javascripts/merge_request_spec.js b/spec/javascripts/merge_request_spec.js index dc61482fdf3..b6173b9b171 100644 --- a/spec/javascripts/merge_request_spec.js +++ b/spec/javascripts/merge_request_spec.js @@ -17,7 +17,7 @@ describe('MergeRequest', function() { mock = new MockAdapter(axios); mock - .onPatch(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`) + .onPatch(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`) .reply(200, {}); this.merge = new MergeRequest(); @@ -75,7 +75,7 @@ describe('MergeRequest', function() { setTimeout(() => { expect(axios.patch).toHaveBeenCalledWith( - `${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`, + `${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`, { merge_request: { description: '- [ ] Task List Item\n- [ ] \n- [ ] Task List Item 2\n', @@ -93,7 +93,9 @@ describe('MergeRequest', function() { // eslint-disable-next-line jasmine/no-disabled-tests xit('shows an error notification when tasklist update failed', done => { mock - .onPatch(`${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/merge_requests/1.json`) + .onPatch( + `${gl.TEST_HOST}/frontend-fixtures/merge-requests-project/-/merge_requests/1.json`, + ) .reply(409, {}); $('.js-task-list-field').trigger({ diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 73b1ea4d36f..1672cf69485 100644 --- a/spec/javascripts/merge_request_tabs_spec.js +++ b/spec/javascripts/merge_request_tabs_spec.js @@ -147,53 +147,53 @@ describe('MergeRequestTabs', function() { it('changes from commits', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1/commits', + pathname: '/foo/bar/-/merge_requests/1/commits', }); - expect(this.subject('show')).toBe('/foo/bar/merge_requests/1'); - expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs'); + expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1'); + expect(this.subject('diffs')).toBe('/foo/bar/-/merge_requests/1/diffs'); }); it('changes from diffs', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1/diffs', + pathname: '/foo/bar/-/merge_requests/1/diffs', }); - expect(this.subject('show')).toBe('/foo/bar/merge_requests/1'); - expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits'); + expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1'); + expect(this.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits'); }); it('changes from diffs.html', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1/diffs.html', + pathname: '/foo/bar/-/merge_requests/1/diffs.html', }); - expect(this.subject('show')).toBe('/foo/bar/merge_requests/1'); - expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits'); + expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1'); + expect(this.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits'); }); it('changes from notes', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1', + pathname: '/foo/bar/-/merge_requests/1', }); - expect(this.subject('diffs')).toBe('/foo/bar/merge_requests/1/diffs'); - expect(this.subject('commits')).toBe('/foo/bar/merge_requests/1/commits'); + expect(this.subject('diffs')).toBe('/foo/bar/-/merge_requests/1/diffs'); + expect(this.subject('commits')).toBe('/foo/bar/-/merge_requests/1/commits'); }); it('includes search parameters and hash string', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1/diffs', + pathname: '/foo/bar/-/merge_requests/1/diffs', search: '?view=parallel', hash: '#L15-35', }); - expect(this.subject('show')).toBe('/foo/bar/merge_requests/1?view=parallel#L15-35'); + expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1?view=parallel#L15-35'); }); it('replaces the current history state', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1', + pathname: '/foo/bar/-/merge_requests/1', }); const newState = this.subject('commits'); @@ -208,10 +208,10 @@ describe('MergeRequestTabs', function() { it('treats "show" like "notes"', function() { setLocation({ - pathname: '/foo/bar/merge_requests/1/commits', + pathname: '/foo/bar/-/merge_requests/1/commits', }); - expect(this.subject('show')).toBe('/foo/bar/merge_requests/1'); + expect(this.subject('show')).toBe('/foo/bar/-/merge_requests/1'); }); }); diff --git a/spec/javascripts/notes/components/note_actions_spec.js b/spec/javascripts/notes/components/note_actions_spec.js index 2e0694869ba..a65e2fc31ad 100644 --- a/spec/javascripts/notes/components/note_actions_spec.js +++ b/spec/javascripts/notes/components/note_actions_spec.js @@ -30,7 +30,7 @@ describe('noteActions', () => { canAwardEmoji: true, canReportAsAbuse: true, noteId: '539', - noteUrl: `${TEST_HOST}/group/project/merge_requests/1#note_1`, + noteUrl: `${TEST_HOST}/group/project/-/merge_requests/1#note_1`, reportAbusePath: `${TEST_HOST}/abuse_reports/new?ref_url=http%3A%2F%2Flocalhost%3A3000%2Fgitlab-org%2Fgitlab-ce%2Fissues%2F7%23note_539&user_id=26`, showReply: false, }; |