Add latest changes from gitlab-org/gitlab@14-9-stable-eev14.9.0-rc42

3 files changed, 55 insertions, 2 deletions

diff --git a/spec/lib/sidebars/groups/menus/kubernetes_menu_spec.rb b/spec/lib/sidebars/groups/menus/kubernetes_menu_spec.rb
index 76e58367c9d..36d5b3376b7 100644
--- a/spec/lib/sidebars/groups/menus/kubernetes_menu_spec.rb
+++ b/spec/lib/sidebars/groups/menus/kubernetes_menu_spec.rb
@@ -28,5 +28,15 @@ RSpec.describe Sidebars::Groups::Menus::KubernetesMenu do
         expect(menu.render?).to eq false
       end
     end
+
+    context ':certificate_based_clusters feature flag is disabled' do
+      before do
+        stub_feature_flags(certificate_based_clusters: false)
+      end
+
+      it 'returns false' do
+        expect(menu.render?).to eq false
+      end
+    end
   end
 end
diff --git a/spec/lib/sidebars/groups/menus/packages_registries_menu_spec.rb b/spec/lib/sidebars/groups/menus/packages_registries_menu_spec.rb
index bc1fa3e88ff..d3cb18222b5 100644
--- a/spec/lib/sidebars/groups/menus/packages_registries_menu_spec.rb
+++ b/spec/lib/sidebars/groups/menus/packages_registries_menu_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe Sidebars::Groups::Menus::PackagesRegistriesMenu do
 
     context 'when menu does not have any menu item to show' do
       it 'returns false' do
+        stub_feature_flags(harbor_registry_integration: false)
         stub_container_registry_config(enabled: false)
         stub_config(packages: { enabled: false })
         stub_config(dependency_proxy: { enabled: false })
@@ -35,11 +36,13 @@ RSpec.describe Sidebars::Groups::Menus::PackagesRegistriesMenu do
   describe '#link' do
     let(:registry_enabled) { true }
     let(:packages_enabled) { true }
+    let(:harbor_registry_integration) { true }
 
     before do
       stub_container_registry_config(enabled: registry_enabled)
       stub_config(packages: { enabled: packages_enabled })
       stub_config(dependency_proxy: { enabled: true })
+      stub_feature_flags(harbor_registry_integration: harbor_registry_integration)
     end
 
     subject { menu.link }
@@ -60,8 +63,16 @@ RSpec.describe Sidebars::Groups::Menus::PackagesRegistriesMenu do
       context 'when Container Registry is not visible' do
         let(:registry_enabled) { false }
 
-        it 'menu link points to Dependency Proxy page' do
-          expect(subject).to eq find_menu(menu, :dependency_proxy).link
+        it 'menu link points to Harbor Registry page' do
+          expect(subject).to eq find_menu(menu, :harbor_registry).link
+        end
+
+        context 'when Harbor Registry is not visible' do
+          let(:harbor_registry_integration) { false }
+
+          it 'menu link points to Dependency Proxy page' do
+            expect(subject).to eq find_menu(menu, :dependency_proxy).link
+          end
         end
       end
     end
@@ -175,6 +186,26 @@ RSpec.describe Sidebars::Groups::Menus::PackagesRegistriesMenu do
         it_behaves_like 'the menu entry is not available'
       end
     end
+
+    describe 'Harbor Registry' do
+      let(:item_id) { :harbor_registry }
+
+      before do
+        stub_feature_flags(harbor_registry_integration: harbor_registry_enabled)
+      end
+
+      context 'when config harbor registry setting is disabled' do
+        let(:harbor_registry_enabled) { false }
+
+        it_behaves_like 'the menu entry is not available'
+      end
+
+      context 'when config harbor registry setting is enabled' do
+        let(:harbor_registry_enabled) { true }
+
+        it_behaves_like 'the menu entry is available'
+      end
+    end
   end
 
   private
diff --git a/spec/lib/sidebars/groups/menus/settings_menu_spec.rb b/spec/lib/sidebars/groups/menus/settings_menu_spec.rb
index 252da8ea699..71b696516b6 100644
--- a/spec/lib/sidebars/groups/menus/settings_menu_spec.rb
+++ b/spec/lib/sidebars/groups/menus/settings_menu_spec.rb
@@ -72,6 +72,18 @@ RSpec.describe Sidebars::Groups::Menus::SettingsMenu do
       let(:item_id) { :ci_cd }
 
       it_behaves_like 'access rights checks'
+
+      describe 'when runner list group view is disabled' do
+        before do
+          stub_feature_flags(runner_list_group_view_vue_ui: false)
+        end
+
+        it_behaves_like 'access rights checks'
+
+        it 'has group runners as active_routes' do
+          expect(subject.active_routes[:path]).to match_array %w[ci_cd#show groups/runners#show groups/runners#edit]
+        end
+      end
     end
 
     describe 'Applications menu' do