Add latest changes from gitlab-org/gitlab@master

2 files changed, 19 insertions, 6 deletions

diff --git a/spec/features/runners_spec.rb b/spec/features/runners_spec.rb
index 63d21d94b5f..0049d3ca7c9 100644
--- a/spec/features/runners_spec.rb
+++ b/spec/features/runners_spec.rb
@@ -272,6 +272,12 @@ describe 'Runners' do
 
         expect(page).to have_content 'This group does not provide any group Runners yet'
       end
+
+      it 'user can see a link to install runners on kubernetes clusters' do
+        visit group_settings_ci_cd_path(group)
+
+        expect(page).to have_link('Install Runner on Kubernetes', href: group_clusters_path(group))
+      end
     end
 
     context 'group with a runner' do
diff --git a/spec/helpers/search_helper_spec.rb b/spec/helpers/search_helper_spec.rb
index e1dc589236b..cc058d5b983 100644
--- a/spec/helpers/search_helper_spec.rb
+++ b/spec/helpers/search_helper_spec.rb
@@ -103,19 +103,17 @@ describe SearchHelper do
     using RSpec::Parameterized::TableSyntax
 
     where(:scope, :label) do
+      'blobs'          | 'code result'
       'commits'        | 'commit'
       'issues'         | 'issue'
       'merge_requests' | 'merge request'
       'milestones'     | 'milestone'
+      'notes'          | 'comment'
       'projects'       | 'project'
+      'snippet_blobs'  | 'snippet result'
       'snippet_titles' | 'snippet'
       'users'          | 'user'
-
-      'blobs'          | 'result'
-      'snippet_blobs'  | 'result'
-      'wiki_blobs'     | 'result'
-
-      'notes'          | 'comment'
+      'wiki_blobs'     | 'wiki result'
     end
 
     with_them do
@@ -140,6 +138,15 @@ describe SearchHelper do
     end
   end
 
+  describe 'search_entries_empty_message' do
+    it 'returns the formatted entry message' do
+      message = search_entries_empty_message('projects', 'foo')
+
+      expect(message).to eq("We couldn't find any projects matching <code>foo</code>")
+      expect(message).to be_html_safe
+    end
+  end
+
   describe 'search_filter_input_options' do
     context 'project' do
       before do