diff options
Diffstat (limited to 'spec')
4 files changed, 30 insertions, 17 deletions
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb index 0fd748af3ce..b4bcbe9d812 100644 --- a/spec/features/admin/admin_hooks_spec.rb +++ b/spec/features/admin/admin_hooks_spec.rb @@ -85,7 +85,7 @@ describe 'Admin::Hooks' do it 'from hooks list page' do visit admin_hooks_path - accept_confirm { click_link 'Remove' } + accept_confirm { click_link 'Delete' } expect(page).not_to have_content(hook_url) end @@ -93,7 +93,7 @@ describe 'Admin::Hooks' do visit admin_hooks_path click_link 'Edit' - accept_confirm { click_link 'Remove' } + accept_confirm { click_link 'Delete' } expect(page).not_to have_content(hook_url) end end diff --git a/spec/features/projects/settings/integration_settings_spec.rb b/spec/features/projects/settings/integration_settings_spec.rb index 26ea4ec5944..de987b879eb 100644 --- a/spec/features/projects/settings/integration_settings_spec.rb +++ b/spec/features/projects/settings/integration_settings_spec.rb @@ -89,12 +89,12 @@ describe 'Projects > Settings > Integration settings' do expect(current_path).to eq(integrations_path) end - context 'remove existing webhook' do + context 'delete existing webhook' do it 'from webhooks list page' do hook visit integrations_path - expect { click_link 'Remove' }.to change(ProjectHook, :count).by(-1) + expect { click_link 'Delete' }.to change(ProjectHook, :count).by(-1) end it 'from webhook edit page' do @@ -102,7 +102,7 @@ describe 'Projects > Settings > Integration settings' do visit integrations_path click_link 'Edit' - expect { click_link 'Remove' }.to change(ProjectHook, :count).by(-1) + expect { click_link 'Delete' }.to change(ProjectHook, :count).by(-1) end end end diff --git a/spec/frontend/fixtures/static/projects.json b/spec/frontend/fixtures/static/projects.json index d92d3acdea0..f28d9899099 100644 --- a/spec/frontend/fixtures/static/projects.json +++ b/spec/frontend/fixtures/static/projects.json @@ -99,6 +99,15 @@ "access_level": 50, "notification_level": 3 } + }, + "_links": { + "self": "https://gitlab.com/api/v4/projects/278964", + "issues": "https://gitlab.com/api/v4/projects/278964/issues", + "merge_requests": "https://gitlab.com/api/v4/projects/278964/merge_requests", + "repo_branches": "https://gitlab.com/api/v4/projects/278964/repository/branches", + "labels": "https://gitlab.com/api/v4/projects/278964/labels", + "events": "https://gitlab.com/api/v4/projects/278964/events", + "members": "https://gitlab.com/api/v4/projects/278964/members" } }, { "id": 7, diff --git a/spec/frontend/repository/components/preview/__snapshots__/index_spec.js.snap b/spec/frontend/repository/components/preview/__snapshots__/index_spec.js.snap index a5e3eb4bce1..cdc7ece89f6 100644 --- a/spec/frontend/repository/components/preview/__snapshots__/index_spec.js.snap +++ b/spec/frontend/repository/components/preview/__snapshots__/index_spec.js.snap @@ -5,20 +5,24 @@ exports[`Repository file preview component renders file HTML 1`] = ` class="file-holder limited-width-container readme-holder" > <div - class="file-title" + class="js-file-title file-title-flex-parent" > - <i - aria-hidden="true" - class="fa fa-file-text-o fa-fw" - /> - - <gllink-stub - href="http://test.com" + <div + class="file-header-content" > - <strong> - README.md - </strong> - </gllink-stub> + <i + aria-hidden="true" + class="fa fa-file-text-o fa-fw" + /> + + <gllink-stub + href="http://test.com" + > + <strong> + README.md + </strong> + </gllink-stub> + </div> </div> <div |