diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 21:08:56 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-28 21:08:56 +0000 |
| commit | c1924b863ad66503edbaa3325949bce6b023b737 (patch) | |
| tree | d6ab8e583d5cdb0849e10677c6223f4efbeca993 /spec/frontend | |
| parent | 6315ed9630fb1c6ade3114beb762cd1568d79219 (diff) | |
| download | gitlab-ce-c1924b863ad66503edbaa3325949bce6b023b737.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
| -rw-r--r-- | spec/frontend/ide/stores/actions/file_spec.js | 8 | ||||
| -rw-r--r-- | spec/frontend/repository/log_tree_spec.js | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/spec/frontend/ide/stores/actions/file_spec.js b/spec/frontend/ide/stores/actions/file_spec.js index a180dd5edc1..dd729651a61 100644 --- a/spec/frontend/ide/stores/actions/file_spec.js +++ b/spec/frontend/ide/stores/actions/file_spec.js @@ -251,7 +251,7 @@ describe('IDE store file actions', () => { describe('success', () => { beforeEach(() => { - mock.onGet(`${RELATIVE_URL_ROOT}/test/test/7297abc/${localFile.path}`).replyOnce( + mock.onGet(`${RELATIVE_URL_ROOT}/test/test/-/7297abc/${localFile.path}`).replyOnce( 200, { blame_path: 'blame_path', @@ -273,7 +273,7 @@ describe('IDE store file actions', () => { .dispatch('getFileData', { path: localFile.path }) .then(() => { expect(service.getFileData).toHaveBeenCalledWith( - `${RELATIVE_URL_ROOT}/test/test/7297abc/${localFile.path}`, + `${RELATIVE_URL_ROOT}/test/test/-/7297abc/${localFile.path}`, ); done(); @@ -345,7 +345,7 @@ describe('IDE store file actions', () => { localFile.path = 'new-shiny-file'; store.state.entries[localFile.path] = localFile; - mock.onGet(`${RELATIVE_URL_ROOT}/test/test/7297abc/old-dull-file`).replyOnce( + mock.onGet(`${RELATIVE_URL_ROOT}/test/test/-/7297abc/old-dull-file`).replyOnce( 200, { blame_path: 'blame_path', @@ -376,7 +376,7 @@ describe('IDE store file actions', () => { describe('error', () => { beforeEach(() => { - mock.onGet(`${RELATIVE_URL_ROOT}/test/test/7297abc/${localFile.path}`).networkError(); + mock.onGet(`${RELATIVE_URL_ROOT}/test/test/-/7297abc/${localFile.path}`).networkError(); }); it('dispatches error action', () => { diff --git a/spec/frontend/repository/log_tree_spec.js b/spec/frontend/repository/log_tree_spec.js index 4271a038680..8da2f39f71f 100644 --- a/spec/frontend/repository/log_tree_spec.js +++ b/spec/frontend/repository/log_tree_spec.js @@ -71,7 +71,7 @@ describe('fetchLogsTree', () => { it('calls axios get', () => fetchLogsTree(client, '', '0', resolver).then(() => { - expect(axios.get).toHaveBeenCalledWith('/gitlab-org/gitlab-foss/refs/master/logs_tree/', { + expect(axios.get).toHaveBeenCalledWith('/gitlab-org/gitlab-foss/-/refs/master/logs_tree/', { params: { format: 'json', offset: '0' }, }); })); |