diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-03 21:10:03 +0300 |
| commit | b6847c621ff246e6abceb90545d5a608318762d6 (patch) | |
| tree | 460da2a6c2be2e4f5164c2bba1851b66260f850d /spec/frontend | |
| parent | c08d9c22569d1c9e7c7737e183969593394133d9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/frontend')
| -rw-r--r-- | spec/frontend/fixtures/snippet.rb | 2 | ||||
| -rw-r--r-- | spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/spec/frontend/fixtures/snippet.rb b/spec/frontend/fixtures/snippet.rb index e91050cd2c5..d27c2fbe68b 100644 --- a/spec/frontend/fixtures/snippet.rb +++ b/spec/frontend/fixtures/snippet.rb @@ -27,7 +27,7 @@ describe SnippetsController, '(JavaScript fixtures)', type: :controller do end it 'snippets/show.html' do - create(:discussion_note_on_snippet, noteable: snippet, project: project, author: admin, note: '- [ ] Task List Item') + create(:discussion_note_on_project_snippet, noteable: snippet, project: project, author: admin, note: '- [ ] Task List Item') get(:show, params: { id: snippet.to_param }) diff --git a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap index f7e15d4a5c4..88710b23bc9 100644 --- a/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap +++ b/spec/frontend/monitoring/components/__snapshots__/dashboard_template_spec.js.snap @@ -96,7 +96,7 @@ exports[`Dashboard template matches the default snapshot 1`] = ` variant="default" > <icon-stub - name="repeat" + name="retry" size="16" /> </gl-deprecated-button-stub> |