Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 18 deletions

diff --git a/spec/features/explore/navbar_spec.rb b/spec/features/explore/navbar_spec.rb
index c172760eb2c..f8fe9bc9af3 100644
--- a/spec/features/explore/navbar_spec.rb
+++ b/spec/features/explore/navbar_spec.rb
@@ -7,19 +7,7 @@ RSpec.describe '"Explore" navbar', :js, feature_category: :navigation do
 
   it_behaves_like 'verified navigation bar' do
     before do
-      stub_feature_flags(global_ci_catalog: false)
       visit explore_projects_path
     end
   end
-
-  context "with 'global_ci_catalog' enabled" do
-    include_context '"Explore" navbar structure with global_ci_catalog FF'
-
-    it_behaves_like 'verified navigation bar', global_ci_catalog: true do
-      before do
-        stub_feature_flags(global_ci_catalog: true)
-        visit explore_projects_path
-      end
-    end
-  end
 end
diff --git a/spec/features/user_sorts_things_spec.rb b/spec/features/user_sorts_things_spec.rb
index 8b2ee9f1ced..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
@@ -40,7 +40,7 @@ RSpec.describe "User sorts things", :js do
 
     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