Add latest changes from gitlab-org/gitlab@master

1 files changed, 14 insertions, 0 deletions

diff --git a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
index e3c2466f807..9ae3f814679 100644
--- a/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
+++ b/spec/views/layouts/nav/sidebar/_project.html.haml_spec.rb
@@ -909,8 +909,11 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
     end
 
     describe 'Packages & Registries' do
+      let(:packages_enabled) { false }
+
       before do
         stub_container_registry_config(enabled: registry_enabled)
+        stub_config(packages: { enabled: packages_enabled })
       end
 
       context 'when registry is enabled' do
@@ -932,6 +935,17 @@ RSpec.describe 'layouts/nav/sidebar/_project' do
           expect(rendered).not_to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project))
         end
       end
+
+      context 'when packages config is enabled' do
+        let(:registry_enabled) { false }
+        let(:packages_enabled) { true }
+
+        it 'has a link to the Packages & Registries settings' do
+          render
+
+          expect(rendered).to have_link('Packages & Registries', href: project_settings_packages_and_registries_path(project))
+        end
+      end
     end
 
     describe 'Usage Quotas' do