diff options
| author | Phil Hughes <me@iamphill.com> | 2018-06-07 15:11:10 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-06-07 15:11:10 +0100 |
| commit | 132db99a5b98daf7629f416ebb4ff817010cc0a9 (patch) | |
| tree | 280f73e03a98c12a2c21d483325c865d4ce30a07 | |
| parent | 02a2ca6ae4ab6f2b64ff00f5750a68e9371a4fb7 (diff) | |
| download | gitlab-ce-132db99a5b98daf7629f416ebb4ff817010cc0a9.tar.gz | |
fixed karma
| -rw-r--r-- | app/assets/javascripts/lib/utils/url_utility.js | 4 | ||||
| -rw-r--r-- | spec/javascripts/lib/utils/url_utility_spec.js | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/lib/utils/url_utility.js b/app/assets/javascripts/lib/utils/url_utility.js index 061fb72ffef..72b72f4247d 100644 --- a/app/assets/javascripts/lib/utils/url_utility.js +++ b/app/assets/javascripts/lib/utils/url_utility.js @@ -85,9 +85,9 @@ export function redirectTo(url) { } export function webIDEUrl(route = undefined) { - let returnUrl = `${gon.relative_url_root}/-/ide/`; + let returnUrl = `${gon.relative_url_root || ''}/-/ide/`; if (route) { - returnUrl += `project${route.replace(new RegExp(`^${gon.relative_url_root}`), '')}`; + returnUrl += `project${route.replace(new RegExp(`^${gon.relative_url_root || ''}`), '')}`; } return returnUrl; } diff --git a/spec/javascripts/lib/utils/url_utility_spec.js b/spec/javascripts/lib/utils/url_utility_spec.js index 8ed4950ee09..c7f4092911c 100644 --- a/spec/javascripts/lib/utils/url_utility_spec.js +++ b/spec/javascripts/lib/utils/url_utility_spec.js @@ -2,6 +2,10 @@ import { webIDEUrl } from '~/lib/utils/url_utility'; describe('URL utility', () => { describe('webIDEUrl', () => { + afterEach(() => { + gon.relative_url_root = ''; + }); + describe('without relative_url_root', () => { it('returns IDE path with route', () => { expect(webIDEUrl('/gitlab-org/gitlab-ce/merge_requests/1')).toBe( |