Add latest changes from gitlab-org/gitlab@master

6 files changed, 15 insertions, 7 deletions

diff --git a/spec/features/frequently_visited_projects_and_groups_spec.rb b/spec/features/frequently_visited_projects_and_groups_spec.rb
index 514b642a2d4..764e88882a8 100644
--- a/spec/features/frequently_visited_projects_and_groups_spec.rb
+++ b/spec/features/frequently_visited_projects_and_groups_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'Frequently visited items', :js, feature_category: :shared do
-  include Features::TopNavSpecHelpers
-
   let_it_be(:user) { create(:user) }
 
   before do
diff --git a/spec/features/projects/new_project_spec.rb b/spec/features/projects/new_project_spec.rb
index a3cbb86da2c..1c25fce5270 100644
--- a/spec/features/projects/new_project_spec.rb
+++ b/spec/features/projects/new_project_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'New project', :js, feature_category: :groups_and_projects do
-  include Features::TopNavSpecHelpers
-
   before do
     stub_application_setting(import_sources: Gitlab::ImportSources.values)
   end
diff --git a/spec/features/projects/show/user_sees_git_instructions_spec.rb b/spec/features/projects/show/user_sees_git_instructions_spec.rb
index 5e6857843a6..4933b3f239c 100644
--- a/spec/features/projects/show/user_sees_git_instructions_spec.rb
+++ b/spec/features/projects/show/user_sees_git_instructions_spec.rb
@@ -10,6 +10,7 @@ RSpec.describe 'Projects > Show > User sees Git instructions', feature_category:
     # validation failure on NotificationSetting.
     # See https://gitlab.com/gitlab-org/gitlab/-/issues/299822#note_492817174
     user.notification_settings.reset
+    stub_feature_flags(project_overview_reorg: false)
   end
 
   shared_examples_for 'redirects to the sign in page' do
diff --git a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
index 41eab966895..674c7db83f1 100644
--- a/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
+++ b/spec/features/projects/show/user_sees_setup_shortcut_buttons_spec.rb
@@ -17,8 +17,8 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons', feature_cat
 
     describe 'as a normal user' do
       before do
+        stub_feature_flags(project_overview_reorg: false)
         sign_in(user)
-
         visit project_path(project)
       end
 
@@ -40,6 +40,7 @@ RSpec.describe 'Projects > Show > User sees setup shortcut buttons', feature_cat
 
     describe 'as a maintainer' do
       before do
+        stub_feature_flags(project_overview_reorg: false)
         project.add_maintainer(user)
         sign_in(user)
 
diff --git a/spec/features/projects_spec.rb b/spec/features/projects_spec.rb
index c6966e47f0a..77ba5c53a35 100644
--- a/spec/features/projects_spec.rb
+++ b/spec/features/projects_spec.rb
@@ -12,6 +12,7 @@ RSpec.describe 'Project', feature_category: :groups_and_projects do
     before do
       sign_in user
       visit new_project_path
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     shared_examples 'creates from template' do |template, sub_template_tab = nil|
@@ -99,6 +100,7 @@ RSpec.describe 'Project', feature_category: :groups_and_projects do
 
     before do
       sign_in(project.first_owner)
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     it 'parses Markdown' do
@@ -164,6 +166,7 @@ RSpec.describe 'Project', feature_category: :groups_and_projects do
     before do
       sign_in(project.first_owner)
       visit path
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     it 'shows project topics' do
@@ -195,6 +198,7 @@ RSpec.describe 'Project', feature_category: :groups_and_projects do
     before do
       sign_in(project.first_owner)
       visit path
+      stub_feature_flags(project_overview_reorg: false)
     end
 
     context 'desktop component' do
@@ -427,6 +431,10 @@ RSpec.describe 'Project', feature_category: :groups_and_projects do
     let(:project) { create(:project, :repository) }
     let(:user) { create(:user) }
 
+    before do
+      stub_feature_flags(project_overview_reorg: false)
+    end
+
     it 'does not contain default branch information in its content', :js do
       default_branch = 'merge-commit-analyze-side-branch'
 
diff --git a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
index 83eb7cb989e..5d121d9eeba 100644
--- a/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
+++ b/spec/features/uploads/user_uploads_avatar_to_profile_spec.rb
@@ -18,8 +18,10 @@ RSpec.describe 'User uploads avatar to profile', feature_category: :user_profile
 
       wait_for_all_requests
 
-      data_uri = find('.avatar-image .gl-avatar')['src']
-      within_testid('user-dropdown') { expect(find('.gl-avatar')['src']).to eq data_uri }
+      within_testid('user-dropdown') do
+        # We are setting a blob URL
+        expect(find('.gl-avatar')['src']).to start_with 'blob:'
+      end
 
       visit profile_path