diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 00:07:59 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-17 00:07:59 +0000 |
commit | 7480d774dfca97ea905321d52c70fd19496f0084 (patch) | |
tree | 8b664509b6be79bbe226fdd3994dadae56864b83 /spec | |
parent | 69d6d3ca2013e97cfd2d89449669ea7bf475f4e9 (diff) | |
download | gitlab-ce-7480d774dfca97ea905321d52c70fd19496f0084.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec')
-rw-r--r-- | spec/frontend/ide/lib/files_spec.js | 3 | ||||
-rw-r--r-- | spec/frontend/ide/services/index_spec.js | 2 | ||||
-rw-r--r-- | spec/frontend/ide/stores/utils_spec.js | 8 | ||||
-rw-r--r-- | spec/frontend/lib/utils/url_utility_spec.js | 8 | ||||
-rw-r--r-- | spec/lib/gitlab/import_export/all_models.yml | 1 |
5 files changed, 12 insertions, 10 deletions
diff --git a/spec/frontend/ide/lib/files_spec.js b/spec/frontend/ide/lib/files_spec.js index 654dc6c13c8..34eb57ae0d3 100644 --- a/spec/frontend/ide/lib/files_spec.js +++ b/spec/frontend/ide/lib/files_spec.js @@ -1,6 +1,7 @@ import { viewerInformationForPath } from '~/vue_shared/components/content_viewer/lib/viewer_utils'; import { decorateFiles, splitParent } from '~/ide/lib/files'; -import { decorateData, escapeFileUrl } from '~/ide/stores/utils'; +import { decorateData } from '~/ide/stores/utils'; +import { escapeFileUrl } from '~/lib/utils/url_utility'; const TEST_BRANCH_ID = 'lorem-ipsum'; const TEST_PROJECT_ID = 10; diff --git a/spec/frontend/ide/services/index_spec.js b/spec/frontend/ide/services/index_spec.js index bb0d20bed91..d676d7539b6 100644 --- a/spec/frontend/ide/services/index_spec.js +++ b/spec/frontend/ide/services/index_spec.js @@ -2,7 +2,7 @@ import axios from 'axios'; import MockAdapter from 'axios-mock-adapter'; import services from '~/ide/services'; import Api from '~/api'; -import { escapeFileUrl } from '~/ide/stores/utils'; +import { escapeFileUrl } from '~/lib/utils/url_utility'; jest.mock('~/api'); diff --git a/spec/frontend/ide/stores/utils_spec.js b/spec/frontend/ide/stores/utils_spec.js index 1f54397db55..90f2644de62 100644 --- a/spec/frontend/ide/stores/utils_spec.js +++ b/spec/frontend/ide/stores/utils_spec.js @@ -395,14 +395,6 @@ describe('Multi-file store utils', () => { }); }); - describe('escapeFileUrl', () => { - it('encodes URL excluding the slashes', () => { - expect(utils.escapeFileUrl('/foo-bar/file.md')).toBe('/foo-bar/file.md'); - expect(utils.escapeFileUrl('foo bar/file.md')).toBe('foo%20bar/file.md'); - expect(utils.escapeFileUrl('foo/bar/file.md')).toBe('foo/bar/file.md'); - }); - }); - describe('swapInStateArray', () => { let localState; diff --git a/spec/frontend/lib/utils/url_utility_spec.js b/spec/frontend/lib/utils/url_utility_spec.js index 0e818d6c402..a625c9cd274 100644 --- a/spec/frontend/lib/utils/url_utility_spec.js +++ b/spec/frontend/lib/utils/url_utility_spec.js @@ -322,6 +322,14 @@ describe('URL utility', () => { expect(urlUtils.joinPaths(...paths)).toBe(expected); }); }); + + describe('escapeFileUrl', () => { + it('encodes URL excluding the slashes', () => { + expect(urlUtils.escapeFileUrl('/foo-bar/file.md')).toBe('/foo-bar/file.md'); + expect(urlUtils.escapeFileUrl('foo bar/file.md')).toBe('foo%20bar/file.md'); + expect(urlUtils.escapeFileUrl('foo/bar/file.md')).toBe('foo/bar/file.md'); + }); + }); }); describe('setUrlParams', () => { diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml index 8d436fb28e0..2ea563c50b6 100644 --- a/spec/lib/gitlab/import_export/all_models.yml +++ b/spec/lib/gitlab/import_export/all_models.yml @@ -549,6 +549,7 @@ actions: - design - version versions: &version +- author - issue - designs - actions |