diff options
Diffstat (limited to 'spec/features/merge_requests/user_sorts_merge_requests_spec.rb')
-rw-r--r-- | spec/features/merge_requests/user_sorts_merge_requests_spec.rb | 29 |
1 files changed, 20 insertions, 9 deletions
diff --git a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb index 8f6103c259b..99473f3b1ea 100644 --- a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb @@ -2,9 +2,8 @@ require 'spec_helper' -RSpec.describe 'User sorts merge requests', :js do +RSpec.describe 'User sorts merge requests' do include CookieHelper - include Spec::Support::Helpers::Features::SortingHelpers let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) } let!(:merge_request2) do @@ -23,19 +22,23 @@ RSpec.describe 'User sorts merge requests', :js do end it 'keeps the sort option' do - pajamas_sort_by(s_('SortOptions|Milestone')) + find('.filter-dropdown-container .dropdown').click + + page.within('ul.dropdown-menu.dropdown-menu-right li') do + click_link('Milestone') + end visit(merge_requests_dashboard_path(assignee_username: user.username)) - expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') + expect(find('.issues-filters a.is-active')).to have_content('Milestone') visit(project_merge_requests_path(project)) - expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') + expect(find('.issues-filters a.is-active')).to have_content('Milestone') visit(merge_requests_group_path(group)) - expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') + expect(find('.issues-filters a.is-active')).to have_content('Milestone') end it 'fallbacks to issuable_sort cookie key when remembering the sorting option' do @@ -43,13 +46,17 @@ RSpec.describe 'User sorts merge requests', :js do visit(merge_requests_dashboard_path(assignee_username: user.username)) - expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') + expect(find('.issues-filters a.is-active')).to have_content('Milestone') end it 'separates remember sorting with issues' do create(:issue, project: project) - pajamas_sort_by(s_('SortOptions|Milestone')) + find('.filter-dropdown-container .dropdown').click + + page.within('ul.dropdown-menu.dropdown-menu-right li') do + click_link('Milestone') + end visit(project_issues_path(project)) @@ -66,7 +73,11 @@ RSpec.describe 'User sorts merge requests', :js do end it 'sorts by popularity' do - pajamas_sort_by(s_('SortOptions|Popularity')) + find('.filter-dropdown-container .dropdown').click + + page.within('ul.dropdown-menu.dropdown-menu-right li') do + click_link('Popularity') + end page.within('.mr-list') do page.within('li.merge-request:nth-child(1)') do |