Add latest changes from gitlab-org/gitlab@master

3 files changed, 26 insertions, 5 deletions

diff --git a/spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb b/spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb
index 6d7698db743..860206dc6af 100644
--- a/spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb
+++ b/spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb
@@ -39,7 +39,7 @@ RSpec.describe Sidebars::Projects::Menus::PackagesRegistriesMenu, feature_catego
     before do
       stub_container_registry_config(enabled: registry_enabled)
       stub_config(packages: { enabled: packages_enabled })
-      stub_feature_flags(harbor_registry_integration: false)
+      stub_feature_flags(harbor_registry_integration: false, ml_experiment_tracking: false)
     end
 
     context 'when Packages Registry is visible' do
@@ -181,5 +181,25 @@ RSpec.describe Sidebars::Projects::Menus::PackagesRegistriesMenu, feature_catego
         end
       end
     end
+
+    describe 'Model experiments' do
+      let(:item_id) { :model_experiments }
+
+      context 'when :ml_experiment_tracking is enabled' do
+        it 'shows the menu item' do
+          stub_feature_flags(ml_experiment_tracking: true)
+
+          is_expected.not_to be_nil
+        end
+      end
+
+      context 'when :ml_experiment_tracking is disabled' do
+        it 'does not show the menu item' do
+          stub_feature_flags(ml_experiment_tracking: false)
+
+          is_expected.to be_nil
+        end
+      end
+    end
   end
 end
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 b8d74665042..8f07241d2e2 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,7 +23,8 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::AnalyzeMenu, feature_categ
       :code_review,
       :merge_requests,
       :issues,
-      :insights
+      :insights,
+      :model_experiments
     ])
   end
 end
diff --git a/spec/lib/sidebars/projects/super_sidebar_menus/secure_menu_spec.rb b/spec/lib/sidebars/projects/super_sidebar_menus/secure_menu_spec.rb
index b68b33941c3..74ef761332e 100644
--- a/spec/lib/sidebars/projects/super_sidebar_menus/secure_menu_spec.rb
+++ b/spec/lib/sidebars/projects/super_sidebar_menus/secure_menu_spec.rb
@@ -16,13 +16,13 @@ RSpec.describe Sidebars::Projects::SuperSidebarMenus::SecureMenu, feature_catego
     expect(items.map(&:class).uniq).to eq([Sidebars::NilMenuItem])
     expect(items.map(&:item_id)).to eq([
       :discover_project_security,
-      :audit_events,
       :dashboard,
       :vulnerability_report,
-      :on_demand_scans,
-      :scan_policies,
       :dependency_list,
       :license_compliance,
+      :audit_events,
+      :scan_policies,
+      :on_demand_scans,
       :configuration
     ])
   end