Add latest changes from gitlab-org/gitlab@master

4 files changed, 64 insertions, 4 deletions

diff --git a/spec/features/users/overview_spec.rb b/spec/features/users/overview_spec.rb
index 6c6c5ca2b27..ff903358931 100644
--- a/spec/features/users/overview_spec.rb
+++ b/spec/features/users/overview_spec.rb
@@ -18,6 +18,7 @@ RSpec.describe 'Overview tab on a user profile', :js, feature_category: :user_pr
   end
 
   before do
+    stub_feature_flags(profile_tabs_vue: false)
     sign_in user
   end
 
diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb
index 17c33398c0e..4b2e7c432b7 100644
--- a/spec/features/users/show_spec.rb
+++ b/spec/features/users/show_spec.rb
@@ -16,10 +16,31 @@ RSpec.describe 'User page', feature_category: :user_profile do
   end
 
   context 'with public profile' do
-    it 'shows all the tabs' do
+    context 'with `profile_tabs_vue` feature flag disabled' do
+      before do
+        stub_feature_flags(profile_tabs_vue: false)
+      end
+
+      it 'shows all the tabs' do
+        subject
+
+        page.within '.nav-links' do
+          expect(page).to have_link('Overview')
+          expect(page).to have_link('Activity')
+          expect(page).to have_link('Groups')
+          expect(page).to have_link('Contributed projects')
+          expect(page).to have_link('Personal projects')
+          expect(page).to have_link('Snippets')
+          expect(page).to have_link('Followers')
+          expect(page).to have_link('Following')
+        end
+      end
+    end
+
+    it 'shows all the tabs', :js do
       subject
 
-      page.within '.nav-links' do
+      page.within '[role="tablist"]' do
         expect(page).to have_link('Overview')
         expect(page).to have_link('Activity')
         expect(page).to have_link('Groups')
@@ -189,11 +210,33 @@ RSpec.describe 'User page', feature_category: :user_profile do
       expect(page).to have_content("This user has a private profile")
     end
 
-    it 'shows own tabs' do
+    context 'with `profile_tabs_vue` feature flag disabled' do
+      before do
+        stub_feature_flags(profile_tabs_vue: false)
+      end
+
+      it 'shows own tabs' do
+        sign_in(user)
+        subject
+
+        page.within '.nav-links' do
+          expect(page).to have_link('Overview')
+          expect(page).to have_link('Activity')
+          expect(page).to have_link('Groups')
+          expect(page).to have_link('Contributed projects')
+          expect(page).to have_link('Personal projects')
+          expect(page).to have_link('Snippets')
+          expect(page).to have_link('Followers')
+          expect(page).to have_link('Following')
+        end
+      end
+    end
+
+    it 'shows own tabs', :js do
       sign_in(user)
       subject
 
-      page.within '.nav-links' do
+      page.within '[role="tablist"]' do
         expect(page).to have_link('Overview')
         expect(page).to have_link('Activity')
         expect(page).to have_link('Groups')
@@ -358,6 +401,10 @@ RSpec.describe 'User page', feature_category: :user_profile do
   end
 
   context 'most recent activity' do
+    before do
+      stub_feature_flags(profile_tabs_vue: false)
+    end
+
     it 'shows the most recent activity' do
       subject
 
@@ -388,6 +435,10 @@ RSpec.describe 'User page', feature_category: :user_profile do
   context 'with a bot user' do
     let_it_be(:user) { create(:user, user_type: :security_bot) }
 
+    before do
+      stub_feature_flags(profile_tabs_vue: false)
+    end
+
     describe 'feature flag enabled' do
       before do
         stub_feature_flags(security_auto_fix: true)
diff --git a/spec/features/users/snippets_spec.rb b/spec/features/users/snippets_spec.rb
index 20fc2981418..0d6bb0823b6 100644
--- a/spec/features/users/snippets_spec.rb
+++ b/spec/features/users/snippets_spec.rb
@@ -6,6 +6,10 @@ RSpec.describe 'Snippets tab on a user profile', :js, feature_category: :snippet
   context 'when the user has snippets' do
     let(:user) { create(:user) }
 
+    before do
+      stub_feature_flags(profile_tabs_vue: false)
+    end
+
     context 'pagination' do
       let!(:snippets) { create_list(:snippet, 2, :public, author: user) }
 
diff --git a/spec/features/users/user_browses_projects_on_user_page_spec.rb b/spec/features/users/user_browses_projects_on_user_page_spec.rb
index 841b324fba4..b31e2a054fe 100644
--- a/spec/features/users/user_browses_projects_on_user_page_spec.rb
+++ b/spec/features/users/user_browses_projects_on_user_page_spec.rb
@@ -28,6 +28,10 @@ RSpec.describe 'Users > User browses projects on user page', :js, feature_catego
     end
   end
 
+  before do
+    stub_feature_flags(profile_tabs_vue: false)
+  end
+
   it 'hides loading spinner after load', :js do
     visit user_path(user)
     click_nav_link('Personal projects')