From 283c7bb302510ed1fc55f0d333c484ce7fa781fd Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Tue, 14 Feb 2023 18:12:38 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../features/search/user_searches_for_code_spec.rb | 27 ++++++---------------- 1 file changed, 7 insertions(+), 20 deletions(-) (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 6c9db029683..b7d06a3a962 100644 --- a/spec/features/search/user_searches_for_code_spec.rb +++ b/spec/features/search/user_searches_for_code_spec.rb @@ -3,6 +3,9 @@ require 'spec_helper' RSpec.describe 'User searches for code', :js, :disable_rate_limiter, feature_category: :global_search do + using RSpec::Parameterized::TableSyntax + include ListboxHelpers + let_it_be(:user) { create(:user) } let_it_be_with_reload(:project) { create(:project, :repository, namespace: user.namespace) } @@ -83,14 +86,10 @@ RSpec.describe 'User searches for code', :js, :disable_rate_limiter, feature_cat expect(page).to have_selector('.results', text: expected_result) - find('.ref-selector').click + click_button 'master' wait_for_requests - page.within('.ref-selector') do - fill_in 'Search by Git revision', with: ref_selector - wait_for_requests - find('li', text: ref_selector, match: :prefer_exact).click - end + select_listbox_item(ref_selector) expect(page).to have_selector('.results', text: expected_result) @@ -137,18 +136,12 @@ RSpec.describe 'User searches for code', :js, :disable_rate_limiter, feature_cat end it 'search result changes when refs switched' do - ref = 'master' expect(find('.results')).not_to have_content('path = gitlab-grack') find('.ref-selector').click wait_for_requests - page.within('.ref-selector') do - fill_in _('Search by Git revision'), with: ref - wait_for_requests - - find('li', text: ref).click - end + select_listbox_item('add-ipython-files') expect(page).to have_selector('.results', text: 'path = gitlab-grack') end @@ -192,18 +185,12 @@ RSpec.describe 'User searches for code', :js, :disable_rate_limiter, feature_cat end it 'search result changes when refs switched' do - ref = 'master' expect(find('.results')).not_to have_content('path = gitlab-grack') find('.ref-selector').click wait_for_requests - page.within('.ref-selector') do - fill_in _('Search by Git revision'), with: ref - wait_for_requests - - find('li', text: ref).click - end + select_listbox_item('add-ipython-files') expect(page).to have_selector('.results', text: 'path = gitlab-grack') end -- cgit v1.2.3