diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 18:08:46 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-03 18:08:46 +0000 |
| commit | 63a015fd85ae35634eb882d0078e65d80300816c (patch) | |
| tree | 317928bc138d54e28980962e813004876398a7ac /spec/frontend/ide | |
| parent | 55693cc1ec8ac79444bc7214d2812a4ac41bf043 (diff) | |
| download | gitlab-ce-63a015fd85ae35634eb882d0078e65d80300816c.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend/ide')
| -rw-r--r-- | spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap | 4 | ||||
| -rw-r--r-- | spec/frontend/ide/mock_data.js | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap index 43e606eac6e..db5175c3f7b 100644 --- a/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap +++ b/spec/frontend/ide/components/jobs/__snapshots__/stage_spec.js.snap @@ -14,7 +14,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = ` /> <strong - class="prepend-left-8 ide-stage-title" + class="prepend-left-8 text-truncate" data-container="body" data-original-title="" title="" @@ -42,7 +42,7 @@ exports[`IDE pipeline stage renders stage details & icon 1`] = ` </div> <div - class="card-body" + class="card-body p-0" > <item-stub job="[object Object]" diff --git a/spec/frontend/ide/mock_data.js b/spec/frontend/ide/mock_data.js index 80eb15fe5a6..a1b57dca6bc 100644 --- a/spec/frontend/ide/mock_data.js +++ b/spec/frontend/ide/mock_data.js @@ -165,7 +165,11 @@ export const mergeRequests = [ iid: 1, title: 'Test merge request', project_id: 1, - web_url: `${TEST_HOST}/namespace/project-path/merge_requests/1`, + web_url: `${TEST_HOST}/namespace/project-path/-/merge_requests/1`, + references: { + short: '!1', + full: 'namespace/project-path!1', + }, }, ]; |