Add latest changes from gitlab-org/gitlab@master

13 files changed, 41 insertions, 15 deletions

diff --git a/spec/features/dashboard/shortcuts_spec.rb b/spec/features/dashboard/shortcuts_spec.rb
index 976dcc5a027..c8013d364e3 100644
--- a/spec/features/dashboard/shortcuts_spec.rb
+++ b/spec/features/dashboard/shortcuts_spec.rb
@@ -50,6 +50,7 @@ RSpec.describe 'Dashboard shortcuts', :js, feature_category: :shared do
 
   context 'logged out' do
     before do
+      stub_feature_flags(super_sidebar_logged_out: false)
       visit explore_root_path
     end
 
diff --git a/spec/features/explore/navbar_spec.rb b/spec/features/explore/navbar_spec.rb
index 8f281abe6a7..853d66ed4d1 100644
--- a/spec/features/explore/navbar_spec.rb
+++ b/spec/features/explore/navbar_spec.rb
@@ -7,6 +7,7 @@ RSpec.describe '"Explore" navbar', feature_category: :navigation do
 
   it_behaves_like 'verified navigation bar' do
     before do
+      stub_feature_flags(super_sidebar_logged_out: false)
       visit explore_projects_path
     end
   end
diff --git a/spec/features/explore/user_explores_projects_spec.rb b/spec/features/explore/user_explores_projects_spec.rb
index f259ba6a167..43d464e0c9f 100644
--- a/spec/features/explore/user_explores_projects_spec.rb
+++ b/spec/features/explore/user_explores_projects_spec.rb
@@ -3,6 +3,10 @@
 require 'spec_helper'
 
 RSpec.describe 'User explores projects', feature_category: :user_profile do
+  before do
+    stub_feature_flags(super_sidebar_logged_out: false)
+  end
+
   describe '"All" tab' do
     it_behaves_like 'an "Explore" page with sidebar and breadcrumbs', :explore_projects_path, :projects
   end
diff --git a/spec/features/nav/pinned_nav_items_spec.rb b/spec/features/nav/pinned_nav_items_spec.rb
index cf53e0a322a..1a3ac973ed4 100644
--- a/spec/features/nav/pinned_nav_items_spec.rb
+++ b/spec/features/nav/pinned_nav_items_spec.rb
@@ -168,17 +168,19 @@ RSpec.describe 'Navigation menu item pinning', :js, feature_category: :navigatio
 
   private
 
-  def add_pin(menu_item_title)
-    menu_item = find("[data-testid=\"nav-item-link\"]", text: menu_item_title)
-    menu_item.hover
-    menu_item.find("[data-testid=\"thumbtack-icon\"]").click
+  def add_pin(nav_item_title)
+    nav_item = find("[data-testid=\"nav-item\"]", text: nav_item_title)
+    nav_item.hover
+    pin_button = nav_item.find("[data-testid=\"nav-item-pin\"]")
+    pin_button.click
     wait_for_requests
   end
 
-  def remove_pin(menu_item_title)
-    menu_item = find("[data-testid=\"nav-item-link\"]", text: menu_item_title)
-    menu_item.hover
-    menu_item.find("[data-testid=\"thumbtack-solid-icon\"]").click
+  def remove_pin(nav_item_title)
+    nav_item = find("[data-testid=\"nav-item\"]", text: nav_item_title)
+    nav_item.hover
+    unpin_button = nav_item.find("[data-testid=\"nav-item-unpin\"]")
+    unpin_button.click
     wait_for_requests
   end
 
diff --git a/spec/features/search/user_searches_for_projects_spec.rb b/spec/features/search/user_searches_for_projects_spec.rb
index 48a94161927..51e5ad85e2b 100644
--- a/spec/features/search/user_searches_for_projects_spec.rb
+++ b/spec/features/search/user_searches_for_projects_spec.rb
@@ -8,7 +8,7 @@ RSpec.describe 'User searches for projects', :js, :disable_rate_limiter, feature
   context 'when signed out' do
     context 'when block_anonymous_global_searches is disabled' do
       before do
-        stub_feature_flags(block_anonymous_global_searches: false)
+        stub_feature_flags(block_anonymous_global_searches: false, super_sidebar_logged_out: false)
       end
 
       include_examples 'top right search form'
diff --git a/spec/features/signed_commits_spec.rb b/spec/features/signed_commits_spec.rb
index 0268c8ad0d4..08d2d0575eb 100644
--- a/spec/features/signed_commits_spec.rb
+++ b/spec/features/signed_commits_spec.rb
@@ -2,8 +2,8 @@
 
 require 'spec_helper'
 
-RSpec.describe 'GPG signed commits', feature_category: :source_code_management do
-  let(:project) { create(:project, :public, :repository) }
+RSpec.describe 'GPG signed commits', :js, feature_category: :source_code_management do
+  let_it_be(:project) { create(:project, :public, :repository) }
 
   it 'changes from unverified to verified when the user changes their email to match the gpg key', :sidekiq_might_not_need_inline do
     ref = GpgHelpers::SIGNED_AND_AUTHORED_SHA
@@ -47,7 +47,7 @@ RSpec.describe 'GPG signed commits', feature_category: :source_code_management d
     expect(page).to have_selector('.gl-badge', text: 'Verified')
   end
 
-  context 'shows popover badges', :js do
+  context 'shows popover badges' do
     let(:user_1) do
       create :user, email: GpgHelpers::User1.emails.first, username: 'nannie.bernhard', name: 'Nannie Bernhard'
     end
@@ -163,7 +163,7 @@ RSpec.describe 'GPG signed commits', feature_category: :source_code_management d
     end
   end
 
-  context 'view signed commit on the tree view', :js do
+  context 'view signed commit on the tree view' do
     shared_examples 'a commit with a signature' do
       before do
         visit project_tree_path(project, 'signed-commits')
diff --git a/spec/features/snippets/show_spec.rb b/spec/features/snippets/show_spec.rb
index a354499fa0c..bbb120edb80 100644
--- a/spec/features/snippets/show_spec.rb
+++ b/spec/features/snippets/show_spec.rb
@@ -6,6 +6,10 @@ RSpec.describe 'Snippet', :js, feature_category: :source_code_management do
   let_it_be(:user) { create(:user, :no_super_sidebar) }
   let_it_be(:snippet) { create(:personal_snippet, :public, :repository, author: user) }
 
+  before do
+    stub_feature_flags(super_sidebar_logged_out: false)
+  end
+
   it_behaves_like 'show and render proper snippet blob' do
     let(:anchor) { nil }
 
diff --git a/spec/features/unsubscribe_links_spec.rb b/spec/features/unsubscribe_links_spec.rb
index 01da9063f52..b78efa65888 100644
--- a/spec/features/unsubscribe_links_spec.rb
+++ b/spec/features/unsubscribe_links_spec.rb
@@ -22,6 +22,10 @@ RSpec.describe 'Unsubscribe links', :sidekiq_inline, feature_category: :shared d
   end
 
   context 'when logged out' do
+    before do
+      stub_feature_flags(super_sidebar_logged_out: false)
+    end
+
     context 'when visiting the link from the body' do
       it 'shows the unsubscribe confirmation page and redirects to root path when confirming' do
         visit body_link
diff --git a/spec/features/users/rss_spec.rb b/spec/features/users/rss_spec.rb
index 712e5056138..99451ac472d 100644
--- a/spec/features/users/rss_spec.rb
+++ b/spec/features/users/rss_spec.rb
@@ -22,6 +22,7 @@ RSpec.describe 'User RSS', feature_category: :user_profile do
 
     context 'when signed out' do
       before do
+        stub_feature_flags(super_sidebar_logged_out: false)
         visit path
       end
 
@@ -45,6 +46,7 @@ RSpec.describe 'User RSS', feature_category: :user_profile do
 
     context 'when signed out' do
       before do
+        stub_feature_flags(super_sidebar_logged_out: false)
         visit path
       end
 
diff --git a/spec/features/users/show_spec.rb b/spec/features/users/show_spec.rb
index f8653b22377..522eb12f507 100644
--- a/spec/features/users/show_spec.rb
+++ b/spec/features/users/show_spec.rb
@@ -7,6 +7,10 @@ RSpec.describe 'User page', feature_category: :user_profile do
 
   let_it_be(:user) { create(:user, bio: '<b>Lorem</b> <i>ipsum</i> dolor sit <a href="https://example.com">amet</a>') }
 
+  before do
+    stub_feature_flags(super_sidebar_logged_out: false)
+  end
+
   subject(:visit_profile) { visit(user_path(user)) }
 
   context 'with "user_profile_overflow_menu_vue" feature flag enabled', :js do
diff --git a/spec/features/users/snippets_spec.rb b/spec/features/users/snippets_spec.rb
index 6473753470b..98ac9fa5f92 100644
--- a/spec/features/users/snippets_spec.rb
+++ b/spec/features/users/snippets_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe 'Snippets tab on a user profile', :js, feature_category: :source_
     let(:user) { create(:user, :no_super_sidebar) }
 
     before do
-      stub_feature_flags(profile_tabs_vue: false)
+      stub_feature_flags(profile_tabs_vue: false, super_sidebar_logged_out: false)
     end
 
     context 'pagination' do
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 fb2a80c61e0..5e047192e7b 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
@@ -29,7 +29,7 @@ RSpec.describe 'Users > User browses projects on user page', :js, feature_catego
   end
 
   before do
-    stub_feature_flags(profile_tabs_vue: false)
+    stub_feature_flags(profile_tabs_vue: false, super_sidebar_logged_out: false)
   end
 
   it 'hides loading spinner after load', :js do
diff --git a/spec/features/whats_new_spec.rb b/spec/features/whats_new_spec.rb
index 16a3deae7f3..c8bcf5f6ef0 100644
--- a/spec/features/whats_new_spec.rb
+++ b/spec/features/whats_new_spec.rb
@@ -6,6 +6,10 @@ RSpec.describe "renders a `whats new` dropdown item", feature_category: :onboard
   let_it_be(:user) { create(:user, :no_super_sidebar) }
 
   context 'when not logged in' do
+    before do
+      stub_feature_flags(super_sidebar_logged_out: false)
+    end
+
     it 'and on SaaS it renders', :saas do
       visit user_path(user)