diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-19 14:01:45 +0300 |
commit | 9297025d0b7ddf095eb618dfaaab2ff8f2018d8b (patch) | |
tree | 865198c01d1824a9b098127baa3ab980c9cd2c06 /spec/features/merge_requests/user_sorts_merge_requests_spec.rb | |
parent | 6372471f43ee03c05a7c1f8b0c6ac6b8a7431dbe (diff) |
Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42
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 | 6 |
1 files changed, 3 insertions, 3 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 5ccc24ebca1..3c2e1c4b37e 100644 --- a/spec/features/merge_requests/user_sorts_merge_requests_spec.rb +++ b/spec/features/merge_requests/user_sorts_merge_requests_spec.rb @@ -23,7 +23,7 @@ RSpec.describe 'User sorts merge requests', :js, feature_category: :code_review_ end it 'keeps the sort option' do - pajamas_sort_by(s_('SortOptions|Milestone')) + pajamas_sort_by(s_('SortOptions|Milestone'), from: s_('SortOptions|Created date')) visit(merge_requests_dashboard_path(assignee_username: user.username)) @@ -49,7 +49,7 @@ RSpec.describe 'User sorts merge requests', :js, feature_category: :code_review_ it 'separates remember sorting with issues', :js do create(:issue, project: project) - pajamas_sort_by(s_('SortOptions|Milestone')) + pajamas_sort_by(s_('SortOptions|Milestone'), from: s_('SortOptions|Created date')) visit(project_issues_path(project)) @@ -66,7 +66,7 @@ RSpec.describe 'User sorts merge requests', :js, feature_category: :code_review_ end it 'sorts by popularity' do - pajamas_sort_by(s_('SortOptions|Popularity')) + pajamas_sort_by(s_('SortOptions|Popularity'), from: s_('SortOptions|Created date')) page.within('.mr-list') do page.within('li.merge-request:nth-child(1)') do |