diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 12:08:10 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-16 12:08:10 +0300 |
commit | 13867d66e92c2fd8962a126db4fbdc32891343c9 (patch) | |
tree | 580a1baf1cdd3283ede126ee510ecf1d3562a471 /spec/features | |
parent | 83758a4e5fcfec056b36a4b56fb22c8a915753cc (diff) |
Add latest changes from gitlab-org/gitlab@masterogolowinski-master-patch-27476
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/admin/admin_hooks_spec.rb | 4 | ||||
-rw-r--r-- | spec/features/projects/settings/integration_settings_spec.rb | 6 |
2 files changed, 5 insertions, 5 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 |