summaryrefslogtreecommitdiff
path: root/spec/features/admin/admin_hooks_spec.rb
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-11-06 22:38:35 +0100
committerKamil Trzcinski <ayufan@ayufan.eu>2017-11-06 22:38:35 +0100
commit7599009c2726bfdbd73da360961e4d8611641b02 (patch)
tree1578ea9216c4430e2d5d5043edc85f445716c28b /spec/features/admin/admin_hooks_spec.rb
parentc708931a327edcc70b92be7fcddb84fbbe2c0394 (diff)
parent83c3c19ce5eb6a88cd9ed428fa0f8d68d5fa7167 (diff)
downloadgitlab-ce-7599009c2726bfdbd73da360961e4d8611641b02.tar.gz
Merge remote-tracking branch 'origin/move-kubernetes-from-service-to-clusters-page-10-2-ver' into 35616-move-gke-form-1st-iteration
Diffstat (limited to 'spec/features/admin/admin_hooks_spec.rb')
-rw-r--r--spec/features/admin/admin_hooks_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index 2e65fcc5231..eec44549a03 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -62,14 +62,14 @@ describe 'Admin::Hooks', :js do
it 'from hooks list page' do
visit admin_hooks_path
- expect { click_link 'Remove' }.to change(SystemHook, :count).by(-1)
+ expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
end
it 'from hook edit page' do
visit admin_hooks_path
click_link 'Edit'
- expect { click_link 'Remove' }.to change(SystemHook, :count).by(-1)
+ expect { accept_confirm { find(:link, 'Remove').send_keys(:return) } }.to change(SystemHook, :count).by(-1)
end
end
end