Add latest changes from gitlab-org/gitlab@master

3 files changed, 7 insertions, 12 deletions

diff --git a/spec/features/admin/admin_hooks_spec.rb b/spec/features/admin/admin_hooks_spec.rb
index ee8f94d6658..b4f64cbfa7b 100644
--- a/spec/features/admin/admin_hooks_spec.rb
+++ b/spec/features/admin/admin_hooks_spec.rb
@@ -46,10 +46,12 @@ RSpec.describe 'Admin::Hooks', feature_category: :webhooks do
 
     it 'adds new hook' do
       visit admin_hooks_path
+
+      click_button 'Add new webhook'
       fill_in 'hook_url', with: url
       check 'Enable SSL verification'
 
-      expect { click_button 'Add system hook' }.to change(SystemHook, :count).by(1)
+      expect { click_button 'Add webhook' }.to change(SystemHook, :count).by(1)
       expect(page).to have_content 'SSL Verification: enabled'
       expect(page).to have_current_path(admin_hooks_path, ignore_query: true)
       expect(page).to have_content(url)
@@ -119,11 +121,12 @@ RSpec.describe 'Admin::Hooks', feature_category: :webhooks do
       it 'adds new hook' do
         visit admin_hooks_path
 
+        click_button 'Add new webhook'
         fill_in 'hook_url', with: url
         uncheck 'Repository update events'
         check 'Merge request events'
 
-        expect { click_button 'Add system hook' }.to change(SystemHook, :count).by(1)
+        expect { click_button 'Add webhook' }.to change(SystemHook, :count).by(1)
         expect(page).to have_current_path(admin_hooks_path, ignore_query: true)
         expect(page).to have_content(url)
       end
diff --git a/spec/features/projects/settings/user_searches_in_settings_spec.rb b/spec/features/projects/settings/user_searches_in_settings_spec.rb
index 4ec553a6726..978b678c334 100644
--- a/spec/features/projects/settings/user_searches_in_settings_spec.rb
+++ b/spec/features/projects/settings/user_searches_in_settings_spec.rb
@@ -26,14 +26,6 @@ RSpec.describe 'User searches project settings', :js, feature_category: :groups_
     it_behaves_like 'can highlight results', 'third-party applications'
   end
 
-  context 'in Webhooks page' do
-    before do
-      visit project_hooks_path(project)
-    end
-
-    it_behaves_like 'can highlight results', 'Secret token'
-  end
-
   context 'in Access Tokens page' do
     before do
       visit project_settings_access_tokens_path(project)
diff --git a/spec/features/projects/settings/webhooks_settings_spec.rb b/spec/features/projects/settings/webhooks_settings_spec.rb
index e3d09ba4ded..af7c790c692 100644
--- a/spec/features/projects/settings/webhooks_settings_spec.rb
+++ b/spec/features/projects/settings/webhooks_settings_spec.rb
@@ -31,7 +31,6 @@ RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :grou
 
       it 'show list of webhooks' do
         hook
-
         visit webhooks_path
 
         expect(page.status_code).to eq(200)
@@ -52,6 +51,7 @@ RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :grou
       it 'create webhook', :js do
         visit webhooks_path
 
+        click_button 'Add new webhook'
         fill_in 'URL', with: url
         check 'Tag push events'
         check 'Enable SSL verification'
@@ -60,10 +60,10 @@ RSpec.describe 'Projects > Settings > Webhook Settings', feature_category: :grou
         click_button 'Add webhook'
 
         expect(page).to have_content(url)
+        expect(page).to have_content('Webhook was created')
         expect(page).to have_content('SSL Verification: enabled')
         expect(page).to have_content('Tag push events')
         expect(page).to have_content('Job events')
-        expect(page).to have_content('Push events')
       end
 
       it 'edit existing webhook', :js do