1 files changed, 44 insertions, 40 deletions

diff --git a/spec/features/search/user_searches_for_merge_requests_spec.rb b/spec/features/search/user_searches_for_merge_requests_spec.rb
index a4fbe3a6e59..9bbf2cf16d8 100644
--- a/spec/features/search/user_searches_for_merge_requests_spec.rb
+++ b/spec/features/search/user_searches_for_merge_requests_spec.rb
@@ -2,7 +2,9 @@
 
 require 'spec_helper'
 
-RSpec.describe 'User searches for merge requests', :js do
+RSpec.describe 'User searches for merge requests', :js, :clean_gitlab_redis_rate_limiting do
+  using RSpec::Parameterized::TableSyntax
+
   let(:user) { create(:user) }
   let(:project) { create(:project, namespace: user.namespace) }
   let!(:merge_request1) { create(:merge_request, title: 'Merge Request Foo', source_project: project, target_project: project, created_at: 1.hour.ago) }
@@ -14,62 +16,64 @@ RSpec.describe 'User searches for merge requests', :js do
     select_search_scope('Merge requests')
   end
 
-  before do
-    stub_feature_flags(search_page_vertical_nav: false)
-    project.add_maintainer(user)
-    sign_in(user)
+  where(search_page_vertical_nav_enabled: [true, false])
+  with_them do
+    before do
+      stub_feature_flags(search_page_vertical_nav: search_page_vertical_nav_enabled)
+      sign_in(user)
 
-    visit(search_path)
-  end
+      visit(search_path)
+    end
 
-  include_examples 'top right search form'
-  include_examples 'search timeouts', 'merge_requests'
+    include_examples 'top right search form'
+    include_examples 'search timeouts', 'merge_requests'
 
-  it 'finds a merge request' do
-    search_for_mr(merge_request1.title)
+    it 'finds a merge request' do
+      search_for_mr(merge_request1.title)
 
-    page.within('.results') do
-      expect(page).to have_link(merge_request1.title)
-      expect(page).not_to have_link(merge_request2.title)
+      page.within('.results') do
+        expect(page).to have_link(merge_request1.title)
+        expect(page).not_to have_link(merge_request2.title)
 
-      # Each result should have MR refs like `gitlab-org/gitlab!1`
-      page.all('.search-result-row').each do |e|
-        expect(e.text).to match(/!\d+/)
+        # Each result should have MR refs like `gitlab-org/gitlab!1`
+        page.all('.search-result-row').each do |e|
+          expect(e.text).to match(/!\d+/)
+        end
       end
     end
-  end
 
-  it 'sorts by created date' do
-    search_for_mr('Merge Request')
+    it 'sorts by created date' do
+      search_for_mr('Merge Request')
 
-    page.within('.results') do
-      expect(page.all('.search-result-row').first).to have_link(merge_request2.title)
-      expect(page.all('.search-result-row').last).to have_link(merge_request1.title)
-    end
+      page.within('.results') do
+        expect(page.all('.search-result-row').first).to have_link(merge_request2.title)
+        expect(page.all('.search-result-row').last).to have_link(merge_request1.title)
+      end
 
-    find('[data-testid="sort-highest-icon"]').click
+      find('[data-testid="sort-highest-icon"]').click
 
-    page.within('.results') do
-      expect(page.all('.search-result-row').first).to have_link(merge_request1.title)
-      expect(page.all('.search-result-row').last).to have_link(merge_request2.title)
+      page.within('.results') do
+        expect(page.all('.search-result-row').first).to have_link(merge_request1.title)
+        expect(page.all('.search-result-row').last).to have_link(merge_request2.title)
+      end
     end
-  end
 
-  context 'when on a project page' do
-    it 'finds a merge request' do
-      find('[data-testid="project-filter"]').click
+    context 'when on a project page' do
+      it 'finds a merge request' do
+        find('[data-testid="project-filter"]').click
 
-      wait_for_requests
+        wait_for_requests
 
-      page.within('[data-testid="project-filter"]') do
-        click_on(project.name)
-      end
+        page.within('[data-testid="project-filter"]') do
+          click_on(project.name)
+        end
 
-      search_for_mr(merge_request1.title)
+        search_for_mr(merge_request1.title)
 
-      page.within('.results') do
-        expect(page).to have_link(merge_request1.title)
-        expect(page).not_to have_link(merge_request2.title)
+        page.within('.results') do
+          expect(page).to have_link(merge_request1.title)
+          expect(page).not_to have_link(merge_request2.title)
+        end
       end
     end
   end