diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 00:07:37 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-19 00:07:37 +0300 |
commit | 7f8330873c1a5860b8a9a52d111083a65d210249 (patch) | |
tree | e6c7019f2942b8d2fff313545b7cb4bb996b6870 /spec/javascripts/merge_request_tabs_spec.js | |
parent | bbe243060399191abcba33c7ebd611f6ec34c6cd (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/merge_request_tabs_spec.js')
-rw-r--r-- | spec/javascripts/merge_request_tabs_spec.js | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/spec/javascripts/merge_request_tabs_spec.js b/spec/javascripts/merge_request_tabs_spec.js index 1672cf69485..73b1ea4d36f 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'); }); }); |