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

2 files changed, 0 insertions, 24 deletions

diff --git a/features/admin/hooks.feature b/features/admin/hooks.feature
deleted file mode 100644
index 5ca332d9f1c..00000000000
--- a/features/admin/hooks.feature
+++ /dev/null
@@ -1,9 +0,0 @@
-@admin
-Feature: Admin Hooks
-  Background:
-    Given I sign in as an admin
-
-  Scenario: On Admin Hooks
-    Given I visit admin hooks page
-    Then I submit the form with enabled SSL verification
-    And I see new hook with enabled SSL verification
\ No newline at end of file
diff --git a/features/steps/admin/hooks.rb b/features/steps/admin/hooks.rb
deleted file mode 100644
index 541e25fcb70..00000000000
--- a/features/steps/admin/hooks.rb
+++ /dev/null
@@ -1,15 +0,0 @@
-class Spinach::Features::AdminHooks < Spinach::FeatureSteps
-  include SharedAuthentication
-  include SharedPaths
-  include SharedAdmin
-
-  step "I submit the form with enabled SSL verification" do
-    fill_in 'hook_url', with: 'http://google.com'
-    check "Enable SSL verification"
-    click_on "Add System Hook"
-  end
-
-  step "I see new hook with enabled SSL verification" do
-    expect(page).to have_content "SSL Verification: enabled"
-  end
-end