Add latest changes from gitlab-org/gitlab@master

8 files changed, 52 insertions, 10 deletions

diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/deploy_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/deploy_menu_spec.rb
new file mode 100644
index 00000000000..ec3f911d8dc
--- /dev/null
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/deploy_menu_spec.rb
@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Groups::SuperSidebarMenus::DeployMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Deploy"))
+    expect(subject.sprite_icon).to eq("deployments")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :packages_registry
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb b/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb
index e9c2701021c..df37d5f1b0d 100644
--- a/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb
+++ b/spec/lib/sidebars/groups/super_sidebar_menus/operations_menu_spec.rb
@@ -9,14 +9,13 @@ RSpec.describe Sidebars::Groups::SuperSidebarMenus::OperationsMenu, feature_cate
 
   it 'has title and sprite_icon' do
     expect(subject.title).to eq(s_("Navigation|Operate"))
-    expect(subject.sprite_icon).to eq("deployments")
+    expect(subject.sprite_icon).to eq("cloud-pod")
   end
 
   it 'defines list of NilMenuItem placeholders' do
     expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
     expect(items.map(&:item_id)).to eq([
       :dependency_proxy,
-      :packages_registry,
       :container_registry,
       :group_kubernetes_clusters
     ])
diff --git a/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb b/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
index 5035da9c488..245d1eca0a4 100644
--- a/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
+++ b/spec/lib/sidebars/groups/super_sidebar_panel_spec.rb
@@ -36,6 +36,7 @@ RSpec.describe Sidebars::Groups::SuperSidebarPanel, feature_category: :navigatio
         Sidebars::Groups::SuperSidebarMenus::PlanMenu,
         Sidebars::Groups::SuperSidebarMenus::CodeMenu,
         Sidebars::Groups::SuperSidebarMenus::BuildMenu,
+        Sidebars::Groups::SuperSidebarMenus::DeployMenu,
         Sidebars::Groups::SuperSidebarMenus::SecureMenu,
         Sidebars::Groups::SuperSidebarMenus::OperationsMenu,
         Sidebars::Groups::SuperSidebarMenus::MonitorMenu,
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/analyze_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/analyze_menu_spec.rb
index d459d47c31a..b7d05867d77 100644
--- a/spec/lib/sidebars/projects/super_sidebar_menus/analyze_menu_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/analyze_menu_spec.rb
@@ -23,8 +23,7 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::AnalyzeMenu, feature_categ
       :code_review,
       :merge_request_analytics,
       :issues,
-      :insights,
-      :model_experiments
+      :insights
     ])
   end
 end
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/build_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/build_menu_spec.rb
index 3f2a40e1c7d..06b87003d83 100644
--- a/spec/lib/sidebars/projects/super_sidebar_menus/build_menu_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/build_menu_spec.rb
@@ -18,10 +18,7 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::BuildMenu, feature_categor
       :pipelines,
       :jobs,
       :pipelines_editor,
-      :releases,
-      :environments,
       :pipeline_schedules,
-      :feature_flags,
       :test_cases,
       :artifacts
     ])
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb
new file mode 100644
index 00000000000..50eee173d31
--- /dev/null
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/deploy_menu_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Sidebars::Projects::SuperSidebarMenus::DeployMenu, feature_category: :navigation do
+  subject { described_class.new({}) }
+
+  let(:items) { subject.instance_variable_get(:@items) }
+
+  it 'has title and sprite_icon' do
+    expect(subject.title).to eq(s_("Navigation|Deploy"))
+    expect(subject.sprite_icon).to eq("deployments")
+  end
+
+  it 'defines list of NilMenuItem placeholders' do
+    expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
+    expect(items.map(&:item_id)).to eq([
+      :releases,
+      :feature_flags,
+      :packages_registry,
+      :container_registry,
+      :model_experiments
+    ])
+  end
+end
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/operations_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/operations_menu_spec.rb
index 6ab070c40ae..68ca4fe2aa0 100644
--- a/spec/lib/sidebars/projects/super_sidebar_menus/operations_menu_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/operations_menu_spec.rb
@@ -9,14 +9,13 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::OperationsMenu, feature_ca
 
   it 'has title and sprite_icon' do
     expect(subject.title).to eq(s_("Navigation|Operate"))
-    expect(subject.sprite_icon).to eq("deployments")
+    expect(subject.sprite_icon).to eq("cloud-pod")
   end
 
   it 'defines list of NilMenuItem placeholders' do
     expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
     expect(items.map(&:item_id)).to eq([
-      :packages_registry,
-      :container_registry,
+      :environments,
       :kubernetes,
       :terraform_states,
       :infrastructure_registry,
diff --git a/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb b/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
index 93f0072a111..9ed328f5090 100644
--- a/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_panel_spec.rb
@@ -47,6 +47,7 @@ RSpec.describe Sidebars::Projects::SuperSidebarPanel, feature_category: :navigat
         Sidebars::Projects::SuperSidebarMenus::PlanMenu,
         Sidebars::Projects::SuperSidebarMenus::CodeMenu,
         Sidebars::Projects::SuperSidebarMenus::BuildMenu,
+        Sidebars::Projects::SuperSidebarMenus::DeployMenu,
         Sidebars::Projects::SuperSidebarMenus::SecureMenu,
         Sidebars::Projects::SuperSidebarMenus::OperationsMenu,
         Sidebars::Projects::SuperSidebarMenus::MonitorMenu,