From db2275b561bace34d90b901226d7f46d33e4cbd9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 14 Oct 2022 21:09:20 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- spec/features/search/user_searches_for_code_spec.rb | 2 ++ spec/features/search/user_searches_for_comments_spec.rb | 1 + spec/features/search/user_searches_for_commits_spec.rb | 1 + spec/features/search/user_searches_for_issues_spec.rb | 3 +++ spec/features/search/user_searches_for_merge_requests_spec.rb | 1 + spec/features/search/user_searches_for_milestones_spec.rb | 1 + spec/features/search/user_searches_for_projects_spec.rb | 1 + spec/features/search/user_searches_for_users_spec.rb | 1 + spec/features/search/user_searches_for_wiki_pages_spec.rb | 5 +++++ spec/features/search/user_uses_header_search_field_spec.rb | 1 + 10 files changed, 17 insertions(+) (limited to 'spec/features/search') diff --git a/spec/features/search/user_searches_for_code_spec.rb b/spec/features/search/user_searches_for_code_spec.rb index e2c8708be78..50e6eb66466 100644 --- a/spec/features/search/user_searches_for_code_spec.rb +++ b/spec/features/search/user_searches_for_code_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'User searches for code' do context 'when signed in' do before do + stub_feature_flags(search_page_vertical_nav: false) project.add_maintainer(user) sign_in(user) end @@ -214,6 +215,7 @@ RSpec.describe 'User searches for code' do let(:project) { create(:project, :public, :repository) } before do + stub_feature_flags(search_page_vertical_nav: false) visit(project_path(project)) end diff --git a/spec/features/search/user_searches_for_comments_spec.rb b/spec/features/search/user_searches_for_comments_spec.rb index 5185a2460dc..a6793bc3aa7 100644 --- a/spec/features/search/user_searches_for_comments_spec.rb +++ b/spec/features/search/user_searches_for_comments_spec.rb @@ -7,6 +7,7 @@ RSpec.describe 'User searches for comments' do let(:user) { create(:user) } before do + stub_feature_flags(search_page_vertical_nav: false) project.add_reporter(user) sign_in(user) diff --git a/spec/features/search/user_searches_for_commits_spec.rb b/spec/features/search/user_searches_for_commits_spec.rb index a157483ce70..4ec2a9e6cff 100644 --- a/spec/features/search/user_searches_for_commits_spec.rb +++ b/spec/features/search/user_searches_for_commits_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'User searches for commits', :js do let(:user) { create(:user) } before do + stub_feature_flags(search_page_vertical_nav: false) project.add_reporter(user) sign_in(user) diff --git a/spec/features/search/user_searches_for_issues_spec.rb b/spec/features/search/user_searches_for_issues_spec.rb index c23a54594d4..51d2f355848 100644 --- a/spec/features/search/user_searches_for_issues_spec.rb +++ b/spec/features/search/user_searches_for_issues_spec.rb @@ -18,6 +18,7 @@ RSpec.describe 'User searches for issues', :js do before do project.add_maintainer(user) sign_in(user) + stub_feature_flags(search_page_vertical_nav: false) visit(search_path) end @@ -110,6 +111,7 @@ RSpec.describe 'User searches for issues', :js do before do stub_feature_flags(block_anonymous_global_searches: false) + stub_feature_flags(search_page_vertical_nav: false) visit(search_path) end @@ -127,6 +129,7 @@ RSpec.describe 'User searches for issues', :js do context 'when block_anonymous_global_searches is enabled' do before do + stub_feature_flags(search_page_vertical_nav: false) visit(search_path) end 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 61c61d793db..a4fbe3a6e59 100644 --- a/spec/features/search/user_searches_for_merge_requests_spec.rb +++ b/spec/features/search/user_searches_for_merge_requests_spec.rb @@ -15,6 +15,7 @@ RSpec.describe 'User searches for merge requests', :js do end before do + stub_feature_flags(search_page_vertical_nav: false) project.add_maintainer(user) sign_in(user) diff --git a/spec/features/search/user_searches_for_milestones_spec.rb b/spec/features/search/user_searches_for_milestones_spec.rb index 61f2e8e0c8f..6773059830c 100644 --- a/spec/features/search/user_searches_for_milestones_spec.rb +++ b/spec/features/search/user_searches_for_milestones_spec.rb @@ -11,6 +11,7 @@ RSpec.describe 'User searches for milestones', :js do before do project.add_maintainer(user) sign_in(user) + stub_feature_flags(search_page_vertical_nav: false) visit(search_path) end diff --git a/spec/features/search/user_searches_for_projects_spec.rb b/spec/features/search/user_searches_for_projects_spec.rb index 562da56275c..5902859d1f5 100644 --- a/spec/features/search/user_searches_for_projects_spec.rb +++ b/spec/features/search/user_searches_for_projects_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'User searches for projects', :js do context 'when signed out' do context 'when block_anonymous_global_searches is disabled' do before do + stub_feature_flags(search_page_vertical_nav: false) allow(Gitlab::ApplicationRateLimiter).to receive(:threshold).with(:search_rate_limit).and_return(1000) allow(Gitlab::ApplicationRateLimiter).to receive(:threshold).with(:search_rate_limit_unauthenticated).and_return(1000) stub_feature_flags(block_anonymous_global_searches: false) diff --git a/spec/features/search/user_searches_for_users_spec.rb b/spec/features/search/user_searches_for_users_spec.rb index a5cf12fa068..e21a66fed92 100644 --- a/spec/features/search/user_searches_for_users_spec.rb +++ b/spec/features/search/user_searches_for_users_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'User searches for users' do let(:user3) { create(:user, username: 'gob_2018', name: 'George Oscar Bluth') } before do + stub_feature_flags(search_page_vertical_nav: false) sign_in(user1) end diff --git a/spec/features/search/user_searches_for_wiki_pages_spec.rb b/spec/features/search/user_searches_for_wiki_pages_spec.rb index 9808383adb7..2e390309022 100644 --- a/spec/features/search/user_searches_for_wiki_pages_spec.rb +++ b/spec/features/search/user_searches_for_wiki_pages_spec.rb @@ -8,6 +8,7 @@ RSpec.describe 'User searches for wiki pages', :js do let!(:wiki_page) { create(:wiki_page, wiki: project.wiki, title: 'directory/title', content: 'Some Wiki content') } before do + stub_feature_flags(search_page_vertical_nav: false) project.add_maintainer(user) sign_in(user) @@ -18,6 +19,10 @@ RSpec.describe 'User searches for wiki pages', :js do include_examples 'search timeouts', 'wiki_blobs' shared_examples 'search wiki blobs' do + before do + stub_feature_flags(search_page_vertical_nav: false) + end + it 'finds a page' do find('[data-testid="project-filter"]').click diff --git a/spec/features/search/user_uses_header_search_field_spec.rb b/spec/features/search/user_uses_header_search_field_spec.rb index 41288a34fb2..827e3984896 100644 --- a/spec/features/search/user_uses_header_search_field_spec.rb +++ b/spec/features/search/user_uses_header_search_field_spec.rb @@ -17,6 +17,7 @@ RSpec.describe 'User uses header search field', :js do end before do + stub_feature_flags(search_page_vertical_nav: false) allow(Gitlab::ApplicationRateLimiter).to receive(:threshold).and_return(0) allow(Gitlab::ApplicationRateLimiter).to receive(:threshold).with(:search_rate_limit).and_return(1000) allow(Gitlab::ApplicationRateLimiter).to receive(:threshold).with(:search_rate_limit_unauthenticated).and_return(1000) -- cgit v1.2.3