Add latest changes from gitlab-org/gitlab@13-4-stable-ee

1 files changed, 35 insertions, 2 deletions

diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb
index cd7a3559538..9e95dc40ff8 100644
--- a/spec/views/search/_results.html.haml_spec.rb
+++ b/spec/views/search/_results.html.haml_spec.rb
@@ -3,13 +3,16 @@
 require 'spec_helper'
 
 RSpec.describe 'search/_results' do
+  let(:search_objects) { Issue.page(1).per(2) }
+  let(:scope) { 'issues' }
+
   before do
     controller.params[:action] = 'show'
 
     create_list(:issue, 3)
 
-    @search_objects = Issue.page(1).per(2)
-    @scope = 'issues'
+    @search_objects = search_objects
+    @scope = scope
     @search_term = 'foo'
   end
 
@@ -30,4 +33,34 @@ RSpec.describe 'search/_results' do
       expect(rendered).not_to have_content(/Showing .* of .*/)
     end
   end
+
+  context 'rendering all types of search results' do
+    let_it_be(:project) { create(:project, :repository, :wiki_repo) }
+    let_it_be(:issue) { create(:issue, project: project, title: '*') }
+    let_it_be(:merge_request) { create(:merge_request, title: '*', source_project: project, target_project: project) }
+    let_it_be(:milestone) { create(:milestone, title: '*', project: project) }
+    let_it_be(:note) { create(:discussion_note_on_issue, project: project, note: '*') }
+    let_it_be(:wiki_blob) { create(:wiki_page, project: project, content: '*') }
+    let_it_be(:user) { create(:admin) }
+
+    %w[issues blobs notes wiki_blobs merge_requests milestones].each do |search_scope|
+      context "when scope is #{search_scope}" do
+        let(:scope) { search_scope }
+        let(:search_objects) { Gitlab::ProjectSearchResults.new(user, '*', project: project).objects(scope) }
+
+        it 'renders the click text event tracking attributes' do
+          render
+
+          expect(rendered).to have_selector('[data-track-event=click_text]')
+          expect(rendered).to have_selector('[data-track-property=search_result]')
+        end
+
+        it 'renders the state filter drop down' do
+          render
+
+          expect(rendered).to have_selector('#js-search-filter-by-state')
+        end
+      end
+    end
+  end
 end