From 988424215cf104d9ee24bb1751141424cffb32d1 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Fri, 13 May 2022 12:08:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@master --- .../user_lists_merge_requests_spec.rb | 14 +++++------ .../merge_requests/user_mass_updates_spec.rb | 6 +++-- .../user_sorts_merge_requests_spec.rb | 29 +++++++--------------- 3 files changed, 20 insertions(+), 29 deletions(-) (limited to 'spec/features/merge_requests') diff --git a/spec/features/merge_requests/user_lists_merge_requests_spec.rb b/spec/features/merge_requests/user_lists_merge_requests_spec.rb index 8c1d9dd38b0..2743f7e8ed4 100644 --- a/spec/features/merge_requests/user_lists_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_lists_merge_requests_spec.rb @@ -109,7 +109,7 @@ RSpec.describe 'Merge requests > User lists merge requests' do expect(count_merge_requests).to eq(4) end - it 'sorts by milestone' do + it 'sorts by milestone due date' do visit_merge_requests(project, sort: sort_value_milestone) expect(first_merge_request).to include('fix') @@ -130,12 +130,12 @@ RSpec.describe 'Merge requests > User lists merge requests' do expect(count_merge_requests).to eq(4) end - it 'filters on one label and sorts by due date' do + it 'filters on one label and sorts by milestone due date' do label = create(:label, project: project) create(:label_link, label: label, target: @fix) visit_merge_requests(project, label_name: [label.name], - sort: sort_value_due_date) + sort: sort_value_milestone) expect(first_merge_request).to include('fix') expect(count_merge_requests).to eq(1) @@ -150,19 +150,19 @@ RSpec.describe 'Merge requests > User lists merge requests' do create(:label_link, label: label2, target: @fix) end - it 'sorts by due date' do + it 'sorts by milestone due date' do visit_merge_requests(project, label_name: [label.name, label2.name], - sort: sort_value_due_date) + sort: sort_value_milestone) expect(first_merge_request).to include('fix') expect(count_merge_requests).to eq(1) end context 'filter on assignee and' do - it 'sorts by due soon' do + it 'sorts by milestone due date' do visit_merge_requests(project, label_name: [label.name, label2.name], assignee_id: user.id, - sort: sort_value_due_date) + sort: sort_value_milestone) expect(first_merge_request).to include('fix') expect(count_merge_requests).to eq(1) diff --git a/spec/features/merge_requests/user_mass_updates_spec.rb b/spec/features/merge_requests/user_mass_updates_spec.rb index a15b6072e70..fa866beb773 100644 --- a/spec/features/merge_requests/user_mass_updates_spec.rb +++ b/spec/features/merge_requests/user_mass_updates_spec.rb @@ -5,12 +5,14 @@ require 'spec_helper' RSpec.describe 'Merge requests > User mass updates', :js do let(:project) { create(:project, :repository) } let(:user) { project.creator } + let(:user2) { create(:user) } let!(:merge_request) { create(:merge_request, source_project: project, target_project: project) } before do stub_feature_flags(mr_attention_requests: false) project.add_maintainer(user) + project.add_maintainer(user2) sign_in(user) end @@ -68,9 +70,9 @@ RSpec.describe 'Merge requests > User mass updates', :js do end it 'updates merge request with assignee' do - change_assignee(user.name) + change_assignee(user2.name) - expect(find('.issuable-meta a.author-link')[:title]).to eq "Attention requested from assignee #{user.name}" + expect(find('.issuable-meta a.author-link')[:title]).to eq "Attention requested from assignee #{user2.name}" end end end 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 fba7facaa1f..459145d3ef0 100644 --- a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb @@ -2,8 +2,9 @@ require 'spec_helper' -RSpec.describe 'User sorts merge requests' do +RSpec.describe 'User sorts merge requests', :js 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 @@ -24,23 +25,19 @@ RSpec.describe 'User sorts merge requests' do end it 'keeps the sort option' do - find('.filter-dropdown-container .dropdown').click - - page.within('ul.dropdown-menu.dropdown-menu-right li') do - click_link('Milestone') - end + pajamas_sort_by(s_('SortOptions|Milestone')) visit(merge_requests_dashboard_path(assignee_username: user.username)) - expect(find('.issues-filters a.is-active')).to have_content('Milestone') + expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') visit(project_merge_requests_path(project)) - expect(find('.issues-filters a.is-active')).to have_content('Milestone') + expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') visit(merge_requests_group_path(group)) - expect(find('.issues-filters a.is-active')).to have_content('Milestone') + expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') end it 'fallbacks to issuable_sort cookie key when remembering the sorting option' do @@ -48,17 +45,13 @@ RSpec.describe 'User sorts merge requests' do visit(merge_requests_dashboard_path(assignee_username: user.username)) - expect(find('.issues-filters a.is-active')).to have_content('Milestone') + expect(find('.filter-dropdown-container button.dropdown-toggle')).to have_content('Milestone') end it 'separates remember sorting with issues', :js do create(:issue, project: project) - find('.filter-dropdown-container .dropdown').click - - page.within('ul.dropdown-menu.dropdown-menu-right li') do - click_link('Milestone') - end + pajamas_sort_by(s_('SortOptions|Milestone')) visit(project_issues_path(project)) @@ -75,11 +68,7 @@ RSpec.describe 'User sorts merge requests' do end it 'sorts by popularity' do - find('.filter-dropdown-container .dropdown').click - - page.within('ul.dropdown-menu.dropdown-menu-right li') do - click_link('Popularity') - end + pajamas_sort_by(s_('SortOptions|Popularity')) page.within('.mr-list') do page.within('li.merge-request:nth-child(1)') do -- cgit v1.2.3