1 files changed, 55 insertions, 51 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 fc0d7710a5e..731dd5eca23 100644
--- a/spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb
+++ b/spec/lib/sidebars/projects/menus/packages_registries_menu_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe Sidebars::Projects::Menus::PackagesRegistriesMenu do
   describe '#render?' do
     context 'when menu does not have any menu item to show' do
       it 'returns false' do
-        allow(subject).to receive(:has_items?).and_return(false)
+        allow(subject).to receive(:has_renderable_items?).and_return(false)
 
         expect(subject.render?).to eq false
       end
@@ -36,7 +36,7 @@ RSpec.describe Sidebars::Projects::Menus::PackagesRegistriesMenu do
 
     context 'when Packages Registry is visible' do
       it 'menu link points to Packages Registry page' do
-        expect(subject.link).to eq described_class.new(context).items.find { |i| i.item_id == :packages_registry }.link
+        expect(subject.link).to eq described_class.new(context).renderable_items.find { |i| i.item_id == :packages_registry }.link
       end
     end
 
@@ -44,95 +44,99 @@ RSpec.describe Sidebars::Projects::Menus::PackagesRegistriesMenu do
       let(:packages_enabled) { false }
 
       it 'menu link points to Container Registry page' do
-        expect(subject.link).to eq described_class.new(context).items.find { |i| i.item_id == :container_registry }.link
+        expect(subject.link).to eq described_class.new(context).renderable_items.find { |i| i.item_id == :container_registry }.link
       end
 
       context 'when Container Registry is not visible' do
         let(:registry_enabled) { false }
 
         it 'menu link points to Infrastructure Registry page' do
-          expect(subject.link).to eq described_class.new(context).items.find { |i| i.item_id == :infrastructure_registry }.link
+          expect(subject.link).to eq described_class.new(context).renderable_items.find { |i| i.item_id == :infrastructure_registry }.link
         end
       end
     end
   end
 
-  describe 'Packages Registry' do
-    subject { described_class.new(context).items.find { |i| i.item_id == :packages_registry }}
+  describe 'Menu items' do
+    subject { described_class.new(context).renderable_items.find { |i| i.item_id == item_id } }
 
-    context 'when user can read packages' do
-      context 'when config package setting is disabled' do
-        it 'the menu item is not added to list of menu items' do
-          stub_config(packages: { enabled: false })
+    describe 'Packages Registry' do
+      let(:item_id) { :packages_registry }
 
-          is_expected.to be_nil
+      context 'when user can read packages' do
+        context 'when config package setting is disabled' do
+          it 'the menu item is not added to list of menu items' do
+            stub_config(packages: { enabled: false })
+
+            is_expected.to be_nil
+          end
         end
-      end
 
-      context 'when config package setting is enabled' do
-        it 'the menu item is added to list of menu items' do
-          stub_config(packages: { enabled: true })
+        context 'when config package setting is enabled' do
+          it 'the menu item is added to list of menu items' do
+            stub_config(packages: { enabled: true })
 
-          is_expected.not_to be_nil
+            is_expected.not_to be_nil
+          end
         end
       end
-    end
 
-    context 'when user cannot read packages' do
-      let(:user) { nil }
+      context 'when user cannot read packages' do
+        let(:user) { nil }
 
-      it 'the menu item is not added to list of menu items' do
-        is_expected.to be_nil
+        it 'the menu item is not added to list of menu items' do
+          is_expected.to be_nil
+        end
       end
     end
-  end
 
-  describe 'Container Registry' do
-    subject { described_class.new(context).items.find { |i| i.item_id == :container_registry }}
+    describe 'Container Registry' do
+      let(:item_id) { :container_registry }
 
-    context 'when user can read container images' do
-      context 'when config registry setting is disabled' do
-        it 'the menu item is not added to list of menu items' do
-          stub_container_registry_config(enabled: false)
+      context 'when user can read container images' do
+        context 'when config registry setting is disabled' do
+          it 'the menu item is not added to list of menu items' do
+            stub_container_registry_config(enabled: false)
 
-          is_expected.to be_nil
+            is_expected.to be_nil
+          end
         end
-      end
 
-      context 'when config registry setting is enabled' do
-        it 'the menu item is added to list of menu items' do
-          stub_container_registry_config(enabled: true)
+        context 'when config registry setting is enabled' do
+          it 'the menu item is added to list of menu items' do
+            stub_container_registry_config(enabled: true)
 
-          is_expected.not_to be_nil
+            is_expected.not_to be_nil
+          end
         end
       end
-    end
 
-    context 'when user cannot read container images' do
-      let(:user) { nil }
+      context 'when user cannot read container images' do
+        let(:user) { nil }
 
-      it 'the menu item is not added to list of menu items' do
-        is_expected.to be_nil
+        it 'the menu item is not added to list of menu items' do
+          is_expected.to be_nil
+        end
       end
     end
-  end
 
-  describe 'Infrastructure Registry' do
-    subject { described_class.new(context).items.find { |i| i.item_id == :infrastructure_registry }}
+    describe 'Infrastructure Registry' do
+      let(:item_id) { :infrastructure_registry }
 
-    context 'when feature flag :infrastructure_registry_page is enabled' do
-      it 'the menu item is added to list of menu items' do
-        stub_feature_flags(infrastructure_registry_page: true)
+      context 'when feature flag :infrastructure_registry_page is enabled' do
+        it 'the menu item is added to list of menu items' do
+          stub_feature_flags(infrastructure_registry_page: true)
 
-        is_expected.not_to be_nil
+          is_expected.not_to be_nil
+        end
       end
-    end
 
-    context 'when feature flag :infrastructure_registry_page is disabled' do
-      it 'the menu item is not added to list of menu items' do
-        stub_feature_flags(infrastructure_registry_page: false)
+      context 'when feature flag :infrastructure_registry_page is disabled' do
+        it 'the menu item is not added to list of menu items' do
+          stub_feature_flags(infrastructure_registry_page: false)
 
-        is_expected.to be_nil
+          is_expected.to be_nil
+        end
       end
     end
   end