1 files changed, 8 insertions, 9 deletions
diff --git a/spec/features/user_sorts_things_spec.rb b/spec/features/user_sorts_things_spec.rb
index bc377fb1f8f..c53ad961d84 100644
--- a/spec/features/user_sorts_things_spec.rb
+++ b/spec/features/user_sorts_things_spec.rb
@@ -11,13 +11,13 @@ RSpec.describe "User sorts things", :js do
   include DashboardHelper
 
   let_it_be(:project) { create(:project_empty_repo, :public) }
-  let_it_be(:current_user) { create(:user) } # Using `current_user` instead of just `user` because of the hardoced call in `assigned_mrs_dashboard_path` which is used below.
-  let_it_be(:issue) { create(:issue, project: project, author: current_user) }
-  let_it_be(:merge_request) { create(:merge_request, target_project: project, source_project: project, author: current_user) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:issue) { create(:issue, project: project, author: user) }
+  let_it_be(:merge_request) { create(:merge_request, target_project: project, source_project: project, author: user) }
 
   before do
-    project.add_developer(current_user)
-    sign_in(current_user)
+    project.add_developer(user)
+    sign_in(user)
   end
 
   it "issues -> project home page -> issues", feature_category: :team_planning do
@@ -25,8 +25,7 @@ RSpec.describe "User sorts things", :js do
 
     visit(project_issues_path(project))
 
-    click_button s_('SortOptions|Created date')
-    click_button sort_option
+    pajamas_sort_by sort_option, from: s_('SortOptions|Created date')
 
     visit(project_path(project))
     visit(project_issues_path(project))
@@ -39,9 +38,9 @@ RSpec.describe "User sorts things", :js do
 
     visit(project_merge_requests_path(project))
 
-    pajamas_sort_by(sort_option)
+    pajamas_sort_by sort_option, from: s_('SortOptions|Created date')
 
-    visit(assigned_mrs_dashboard_path)
+    visit(merge_requests_dashboard_path(assignee_username: user.username))
 
     expect(find(".issues-filters")).to have_content(sort_option)
   end