diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-25 12:04:30 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-25 12:04:30 +0000 |
| commit | 67370c8b72013a75705265605517a40daf69fc33 (patch) | |
| tree | 5a54d854073bd1e413f21d76141e09a0a41f7630 /spec/frontend | |
| parent | 185d9acf520cc806840e8ba6c83deb1ec4817e0f (diff) | |
| download | gitlab-ce-67370c8b72013a75705265605517a40daf69fc33.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
| -rw-r--r-- | spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap | 2 | ||||
| -rw-r--r-- | spec/frontend/snippets/components/edit_spec.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap index 3881b2d7679..b80b7fdb43e 100644 --- a/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap +++ b/spec/frontend/design_management/pages/__snapshots__/index_spec.js.snap @@ -111,7 +111,7 @@ exports[`Design management index page designs renders designs list and header wi > <gl-button-stub category="primary" - class="gl-mr-3 js-select-all" + class="gl-mr-4 js-select-all" icon="" size="small" variant="link" diff --git a/spec/frontend/snippets/components/edit_spec.js b/spec/frontend/snippets/components/edit_spec.js index 57142da0557..648285bd2f1 100644 --- a/spec/frontend/snippets/components/edit_spec.js +++ b/spec/frontend/snippets/components/edit_spec.js @@ -200,7 +200,7 @@ describe('Snippet Edit app', () => { it.each` projectPath | snippetArg | expectation - ${''} | ${[]} | ${`${relativeUrlRoot}-/snippets`} + ${''} | ${[]} | ${`${relativeUrlRoot}/-/snippets`} ${'project/path'} | ${[]} | ${`${relativeUrlRoot}project/path/-/snippets`} ${''} | ${[createTestSnippet()]} | ${TEST_WEB_URL} ${'project/path'} | ${[createTestSnippet()]} | ${TEST_WEB_URL} |