diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-21 00:08:46 +0000 |
| commit | 6755df108b123ecc8ae330d7c7bf2f04fbf36a81 (patch) | |
| tree | 7609bd6c0a9ac607d8f57737a2c27a460b7fcfdd /spec/frontend/performance_bar | |
| parent | ee7fba4b844935437233f6c5b74545a28bac4298 (diff) | |
| download | gitlab-ce-6755df108b123ecc8ae330d7c7bf2f04fbf36a81.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/performance_bar')
| -rw-r--r-- | spec/frontend/performance_bar/components/request_selector_spec.js | 2 | ||||
| -rw-r--r-- | spec/frontend/performance_bar/stores/performance_bar_store_spec.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/frontend/performance_bar/components/request_selector_spec.js b/spec/frontend/performance_bar/components/request_selector_spec.js index 871f0485a13..9cc8c5e73f4 100644 --- a/spec/frontend/performance_bar/components/request_selector_spec.js +++ b/spec/frontend/performance_bar/components/request_selector_spec.js @@ -5,7 +5,7 @@ describe('request selector', () => { const requests = [ { id: 'warningReq', - url: 'https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/1/discussions.json', + url: 'https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1/discussions.json', truncatedUrl: 'discussions.json', hasWarnings: true, }, diff --git a/spec/frontend/performance_bar/stores/performance_bar_store_spec.js b/spec/frontend/performance_bar/stores/performance_bar_store_spec.js index 6b7893cb523..56bab71540c 100644 --- a/spec/frontend/performance_bar/stores/performance_bar_store_spec.js +++ b/spec/frontend/performance_bar/stores/performance_bar_store_spec.js @@ -15,14 +15,14 @@ describe('PerformanceBarStore', () => { }); it('keeps the last two components of the path when the last component is numeric', () => { - store.addRequest('id', 'https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/1'); + store.addRequest('id', 'https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1'); expect(findUrl('id')).toEqual('merge_requests/1'); }); it('uses the last component of the path', () => { store.addRequest( 'id', - 'https://gitlab.com/gitlab-org/gitlab-foss/merge_requests/1.json?serializer=widget', + 'https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/1.json?serializer=widget', ); expect(findUrl('id')).toEqual('1.json?serializer=widget'); }); |