From fb553bbc1899eddaddb07cd9685cdabffbed9962 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 26 Aug 2020 06:10:34 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/frontend/snippets/components/edit_spec.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'spec/frontend/snippets') diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js index 648285bd2f1..dff9bf088c0 100644 --- a/spec/frontend/snippets/components/edit_spec.js +++ b/spec/frontend/snippets/components/edit_spec.js @@ -200,8 +200,8 @@ describe('Snippet Edit app', () => { it.each` projectPath | snippetArg | expectation - ${''} | ${[]} | ${`${relativeUrlRoot}/-/snippets`} - ${'project/path'} | ${[]} | ${`${relativeUrlRoot}project/path/-/snippets`} + ${''} | ${[]} | ${urlUtils.joinPaths('/', relativeUrlRoot, '-', 'snippets')} + ${'project/path'} | ${[]} | ${urlUtils.joinPaths('/', relativeUrlRoot, 'project/path/-', 'snippets')} ${''} | ${[createTestSnippet()]} | ${TEST_WEB_URL} ${'project/path'} | ${[createTestSnippet()]} | ${TEST_WEB_URL} `( -- cgit v1.2.1