Add latest changes from gitlab-org/gitlab@master

1 files changed, 35 insertions, 1 deletions

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 4c5b39d5282..2dba5942f3e 100644
--- a/spec/features/projects/settings/user_searches_in_settings_spec.rb
+++ b/spec/features/projects/settings/user_searches_in_settings_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe 'User searches project settings', :js do
   let_it_be(:user) { create(:user) }
-  let_it_be(:project) { create(:project, :repository, namespace: user.namespace) }
+  let_it_be(:project) { create(:project, :repository, namespace: user.namespace, pages_https_only: false) }
 
   before do
     sign_in(user)
@@ -16,6 +16,30 @@ RSpec.describe 'User searches project settings', :js do
     it_behaves_like 'can search settings with feature flag check', 'Naming', 'Visibility'
   end
 
+  context 'in Integrations page' do
+    before do
+      visit project_settings_integrations_path(project)
+    end
+
+    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)
+    end
+
+    it_behaves_like 'can highlight results', 'Expires at'
+  end
+
   context 'in Repository page' do
     before do
       visit project_settings_repository_path(project)
@@ -39,4 +63,14 @@ RSpec.describe 'User searches project settings', :js do
 
     it_behaves_like 'can search settings', 'Alerts', 'Error tracking'
   end
+
+  context 'in Pages page' do
+    before do
+      allow(Gitlab.config.pages).to receive(:enabled).and_return(true)
+
+      visit project_pages_path(project)
+    end
+
+    it_behaves_like 'can highlight results', 'static websites'
+  end
 end