Merge branch 'move-admin-hooks-spinach-test-to-rspec' into 'master'

Move admin hooks spinach to RSpec

https://gitlab.com/gitlab-org/gitlab-ce/issues/23036

See merge request !7942

1 files changed, 8 insertions, 7 deletions

diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index b3ce72b1452..f246997d5a2 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -26,16 +26,17 @@ describe "Admin::Hooks", feature: true do
   end
 
   describe "New Hook" do
-    before do
-      @url = FFaker::Internet.uri("http")
+    let(:url) { FFaker::Internet.uri('http') }
+
+    it 'adds new hook' do
       visit admin_hooks_path
-      fill_in "hook_url", with: @url
-      expect { click_button "Add System Hook" }.to change(SystemHook, :count).by(1)
-    end
+      fill_in 'hook_url', with: url
+      check 'Enable SSL verification'
 
-    it "opens new hook popup" do
+      expect { click_button 'Add System Hook' }.to change(SystemHook, :count).by(1)
+      expect(page).to have_content 'SSL Verification: enabled'
       expect(current_path).to eq(admin_hooks_path)
-      expect(page).to have_content(@url)
+      expect(page).to have_content(url)
     end
   end