1 files changed, 27 insertions, 16 deletions

diff --git a/spec/support/shared_examples/lib/gitlab/search/recent_items.rb b/spec/support/shared_examples/lib/gitlab/search/recent_items.rb
index f96ff4b101e..b3b33e434b9 100644
--- a/spec/support/shared_examples/lib/gitlab/search/recent_items.rb
+++ b/spec/support/shared_examples/lib/gitlab/search/recent_items.rb
@@ -1,12 +1,11 @@
 # frozen_string_literal: true
 
 require 'spec_helper'
-
 RSpec.shared_examples 'search recent items' do
   let_it_be(:user) { create(:user) }
-  let_it_be(:recent_items) { described_class.new(user: user, items_limit: 5) }
-  let(:item) { create_item(content: 'hello world 1', project: project) }
-  let(:project) { create(:project, :public) }
+  let_it_be(:recent_items) { described_class.new(user: user) }
+  let(:item) { create_item(content: 'hello world 1', parent: parent) }
+  let(:parent) { create(parent_type, :public) }
 
   describe '#log_view', :clean_gitlab_redis_shared_state do
     it 'adds the item to the recent items' do
@@ -18,13 +17,15 @@ RSpec.shared_examples 'search recent items' do
     end
 
     it 'removes an item when it exceeds the size items_limit' do
-      (1..6).each do |i|
-        recent_items.log_view(create_item(content: "item #{i}", project: project))
+      recent_items = described_class.new(user: user, items_limit: 3)
+
+      4.times do |i|
+        recent_items.log_view(create_item(content: "item #{i}", parent: parent))
       end
 
       results = recent_items.search('item')
 
-      expect(results.map(&:title)).to contain_exactly('item 6', 'item 5', 'item 4', 'item 3', 'item 2')
+      expect(results.map(&:title)).to contain_exactly('item 3', 'item 2', 'item 1')
     end
 
     it 'expires the items after expires_after' do
@@ -39,7 +40,7 @@ RSpec.shared_examples 'search recent items' do
 
     it 'does not include results logged for another user' do
       another_user = create(:user)
-      another_item = create_item(content: 'hello world 2', project: project)
+      another_item = create_item(content: 'hello world 2', parent: parent)
       described_class.new(user: another_user).log_view(another_item)
       recent_items.log_view(item)
 
@@ -50,11 +51,11 @@ RSpec.shared_examples 'search recent items' do
   end
 
   describe '#search', :clean_gitlab_redis_shared_state do
-    let(:item1) { create_item(content: "matching item 1", project: project) }
-    let(:item2) { create_item(content: "matching item 2", project: project) }
-    let(:item3) { create_item(content: "matching item 3", project: project) }
-    let(:non_matching_item) { create_item(content: "different item", project: project) }
-    let!(:non_viewed_item) { create_item(content: "matching but not viewed item", project: project) }
+    let(:item1) { create_item(content: "matching item 1", parent: parent) }
+    let(:item2) { create_item(content: "matching item 2", parent: parent) }
+    let(:item3) { create_item(content: "matching item 3", parent: parent) }
+    let(:non_matching_item) { create_item(content: "different item", parent: parent) }
+    let!(:non_viewed_item) { create_item(content: "matching but not viewed item", parent: parent) }
 
     before do
       recent_items.log_view(item1)
@@ -74,14 +75,24 @@ RSpec.shared_examples 'search recent items' do
     end
 
     it 'does not leak items you no longer have access to' do
-      private_project = create(:project, :public, namespace: create(:group))
-      private_item = create_item(content: 'matching item title', project: private_project)
+      private_parent = create(parent_type, :public)
+      private_item = create_item(content: 'matching item title', parent: private_parent)
 
       recent_items.log_view(private_item)
 
-      private_project.update!(visibility_level: Project::PRIVATE)
+      private_parent.update!(visibility_level: ::Gitlab::VisibilityLevel::PRIVATE)
 
       expect(recent_items.search('matching')).not_to include(private_item)
     end
+
+    it "limits results to #{Gitlab::Search::RecentItems::SEARCH_LIMIT} items" do
+      (Gitlab::Search::RecentItems::SEARCH_LIMIT + 1).times do |i|
+        recent_items.log_view(create_item(content: "item #{i}", parent: parent))
+      end
+
+      results = recent_items.search('item')
+
+      expect(results.count).to eq(Gitlab::Search::RecentItems::SEARCH_LIMIT)
+    end
   end
 end