diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-19 07:33:21 +0000 |
commit | 36a59d088eca61b834191dacea009677a96c052f (patch) | |
tree | e4f33972dab5d8ef79e3944a9f403035fceea43f /spec/features/dashboard/merge_requests_spec.rb | |
parent | a1761f15ec2cae7c7f7bbda39a75494add0dfd6f (diff) | |
download | gitlab-ce-36a59d088eca61b834191dacea009677a96c052f.tar.gz |
Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42
Diffstat (limited to 'spec/features/dashboard/merge_requests_spec.rb')
-rw-r--r-- | spec/features/dashboard/merge_requests_spec.rb | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb index 7507ef4e453..fd580b679ad 100644 --- a/spec/features/dashboard/merge_requests_spec.rb +++ b/spec/features/dashboard/merge_requests_spec.rb @@ -112,9 +112,12 @@ RSpec.describe 'Dashboard Merge Requests' do end it 'includes assigned and reviewers in badge' do - within("span[aria-label='#{n_("%d merge request", "%d merge requests", 3) % 3}']") do - expect(page).to have_content('3') + within("span[aria-label='#{n_("%d merge request", "%d merge requests", 0) % 0}']") do + expect(page).to have_content('0') end + + find('.dashboard-shortcuts-merge_requests').click + expect(find('.js-assigned-mr-count')).to have_content('2') expect(find('.js-reviewer-mr-count')).to have_content('1') end @@ -165,16 +168,16 @@ RSpec.describe 'Dashboard Merge Requests' do expect(page).to have_content('Please select at least one filter to see results') end - it 'shows sorted merge requests' do - sort_by('Created date') + it 'shows sorted merge requests', :js do + pajamas_sort_by(s_('SortOptions|Created date')) visit merge_requests_dashboard_path(assignee_username: current_user.username) expect(find('.issues-filters')).to have_content('Created date') end - it 'keeps sorting merge requests after visiting Projects MR page' do - sort_by('Created date') + it 'keeps sorting merge requests after visiting Projects MR page', :js do + pajamas_sort_by(s_('SortOptions|Created date')) visit project_merge_requests_path(project) |