1 files changed, 77 insertions, 89 deletions
diff --git a/spec/features/search/user_searches_for_issues_spec.rb b/spec/features/search/user_searches_for_issues_spec.rb
index 6ebbe86d1a9..9451e337db1 100644
--- a/spec/features/search/user_searches_for_issues_spec.rb
+++ b/spec/features/search/user_searches_for_issues_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'User searches for issues', :js, :clean_gitlab_redis_rate_limiting, feature_category: :global_search do
-  using RSpec::Parameterized::TableSyntax
-
   let_it_be(:user) { create(:user) }
   let_it_be(:project) { create(:project, namespace: user.namespace) }
 
@@ -17,133 +15,123 @@ RSpec.describe 'User searches for issues', :js, :clean_gitlab_redis_rate_limitin
     select_search_scope('Issues')
   end
 
-  where(search_page_vertical_nav_enabled: [true, false])
-
-  with_them do
-    context 'when signed in' do
-      before do
-        stub_feature_flags(search_page_vertical_nav: search_page_vertical_nav_enabled)
+  context 'when signed in' do
+    before do
+      project.add_maintainer(user)
+      sign_in(user)
 
-        project.add_maintainer(user)
-        sign_in(user)
+      visit(search_path)
+    end
 
-        visit(search_path)
-      end
+    include_examples 'top right search form'
+    include_examples 'search timeouts', 'issues'
 
-      include_examples 'top right search form'
-      include_examples 'search timeouts', 'issues'
+    it 'finds an issue' do
+      search_for_issue(issue1.title)
 
-      it 'finds an issue' do
-        search_for_issue(issue1.title)
-
-        page.within('.results') do
-          expect(page).to have_link(issue1.title)
-          expect(page).not_to have_link(issue2.title)
-        end
+      page.within('.results') do
+        expect(page).to have_link(issue1.title)
+        expect(page).not_to have_link(issue2.title)
       end
+    end
 
-      it 'hides confidential icon for non-confidential issues' do
-        search_for_issue(issue1.title)
+    it 'hides confidential icon for non-confidential issues' do
+      search_for_issue(issue1.title)
 
-        page.within('.results') do
-          expect(page).not_to have_css('[data-testid="eye-slash-icon"]')
-        end
+      page.within('.results') do
+        expect(page).not_to have_css('[data-testid="eye-slash-icon"]')
       end
+    end
 
-      it 'shows confidential icon for confidential issues' do
-        search_for_issue(issue2.title)
+    it 'shows confidential icon for confidential issues' do
+      search_for_issue(issue2.title)
 
-        page.within('.results') do
-          expect(page).to have_css('[data-testid="eye-slash-icon"]')
-        end
+      page.within('.results') do
+        expect(page).to have_css('[data-testid="eye-slash-icon"]')
       end
+    end
 
-      it 'shows correct badge for open issues' do
-        search_for_issue(issue1.title)
+    it 'shows correct badge for open issues' do
+      search_for_issue(issue1.title)
 
-        page.within('.results') do
-          expect(page).to have_css('.badge-success')
-          expect(page).not_to have_css('.badge-info')
-        end
+      page.within('.results') do
+        expect(page).to have_css('.badge-success')
+        expect(page).not_to have_css('.badge-info')
       end
+    end
 
-      it 'shows correct badge for closed issues' do
-        search_for_issue(issue2.title)
+    it 'shows correct badge for closed issues' do
+      search_for_issue(issue2.title)
 
-        page.within('.results') do
-          expect(page).not_to have_css('.badge-success')
-          expect(page).to have_css('.badge-info')
-        end
+      page.within('.results') do
+        expect(page).not_to have_css('.badge-success')
+        expect(page).to have_css('.badge-info')
       end
+    end
 
-      it 'sorts by created date' do
-        search_for_issue('issue')
+    it 'sorts by created date' do
+      search_for_issue('issue')
 
-        page.within('.results') do
-          expect(page.all('.search-result-row').first).to have_link(issue2.title)
-          expect(page.all('.search-result-row').last).to have_link(issue1.title)
-        end
+      page.within('.results') do
+        expect(page.all('.search-result-row').first).to have_link(issue2.title)
+        expect(page.all('.search-result-row').last).to have_link(issue1.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(issue1.title)
-          expect(page.all('.search-result-row').last).to have_link(issue2.title)
-        end
+      page.within('.results') do
+        expect(page.all('.search-result-row').first).to have_link(issue1.title)
+        expect(page.all('.search-result-row').last).to have_link(issue2.title)
       end
+    end
 
-      context 'when on a project page' do
-        it 'finds an issue' do
-          find('[data-testid="project-filter"]').click
+    context 'when on a project page' do
+      it 'finds an issue' 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_issue(issue1.title)
+        search_for_issue(issue1.title)
 
-          page.within('.results') do
-            expect(page).to have_link(issue1.title)
-            expect(page).not_to have_link(issue2.title)
-          end
+        page.within('.results') do
+          expect(page).to have_link(issue1.title)
+          expect(page).not_to have_link(issue2.title)
         end
       end
     end
+  end
 
-    context 'when signed out' do
-      before do
-        stub_feature_flags(search_page_vertical_nav: search_page_vertical_nav_enabled)
-      end
-
-      context 'when block_anonymous_global_searches is disabled' do
-        let_it_be(:project) { create(:project, :public) }
+  context 'when signed out' do
+    context 'when block_anonymous_global_searches is disabled' do
+      let_it_be(:project) { create(:project, :public) }
 
-        before do
-          stub_feature_flags(block_anonymous_global_searches: false)
+      before do
+        stub_feature_flags(block_anonymous_global_searches: false)
 
-          visit(search_path)
-        end
+        visit(search_path)
+      end
 
-        include_examples 'top right search form'
+      include_examples 'top right search form'
 
-        it 'finds an issue' do
-          search_for_issue(issue1.title)
+      it 'finds an issue' do
+        search_for_issue(issue1.title)
 
-          page.within('.results') do
-            expect(page).to have_link(issue1.title)
-            expect(page).not_to have_link(issue2.title)
-          end
+        page.within('.results') do
+          expect(page).to have_link(issue1.title)
+          expect(page).not_to have_link(issue2.title)
         end
       end
+    end
 
-      context 'when block_anonymous_global_searches is enabled' do
-        it 'is redirected to login page' do
-          visit(search_path)
+    context 'when block_anonymous_global_searches is enabled' do
+      it 'is redirected to login page' do
+        visit(search_path)
 
-          expect(page).to have_content('You must be logged in to search across all of GitLab')
-        end
+        expect(page).to have_content('You must be logged in to search across all of GitLab')
       end
     end
   end