Merge branch '8316-maven-package-permissions-option-wrongly-available-in-starter' into 'master'

Resolve "Maven package permissions option wrongly available in Starter"

Closes #8316

See merge request gitlab-org/gitlab-ee!8270

ee/app/helpers/ee/projects_helper.rb

@@ -32,7 +32,9 @@ module EE
     def get_project_nav_tabs(project, current_user)
       nav_tabs = super
 
-      if ::Gitlab.config.packages.enabled && can?(current_user, :read_package, project)
+      if ::Gitlab.config.packages.enabled &&
+          project.feature_available?(:packages) &&
+          can?(current_user, :read_package, project)
         nav_tabs << :packages
       end
 
@@ -60,7 +62,7 @@ module EE
     override :project_permissions_panel_data
     def project_permissions_panel_data(project)
       super.merge(
-        packagesAvailable: ::Gitlab.config.packages.enabled,
+        packagesAvailable: ::Gitlab.config.packages.enabled && project.feature_available?(:packages),
         packagesHelpPath: help_page_path('user/project/packages/maven_repository')
       )
     end

ee/changelogs/unreleased/8316-maven-package-permissions-option-wrongly-available-in-starter.yml

+---
+title: Don't show packages tab and settings for starter license
+merge_request: 8270
+author:
+type: fixed

ee/spec/features/projects/settings/packages_settings_spec.rb

@@ -14,11 +14,29 @@ describe 'Projects > Settings > Packages', :js do
       allow(Gitlab.config.packages).to receive(:enabled).and_return(true)
     end
 
-    it 'displays the packages toggle button' do
-      visit edit_project_path(project)
+    context 'allowed by license' do
+      before do
+        stub_licensed_features(packages: true)
+      end
+
+      it 'displays the packages toggle button' do
+        visit edit_project_path(project)
+
+        expect(page).to have_content('Packages')
+        expect(page).to have_selector('input[name="project[packages_enabled]"] + button', visible: true)
+      end
+    end
+
+    context 'not allowed by license' do
+      before do
+        stub_licensed_features(packages: false)
+      end
+
+      it 'does not show up in UI' do
+        visit edit_project_path(project)
 
-      expect(page).to have_content('Packages')
-      expect(page).to have_selector('input[name="project[packages_enabled]"] + button', visible: true)
+        expect(page).not_to have_content('Packages')
+      end
     end
   end
 

spec/features/projects/features_visibility_spec.rb

@@ -177,7 +177,7 @@ describe 'Edit Project Settings' do
         click_button "Save changes"
       end
 
-      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.is-disabled", count: 3)
+      expect(find(".sharing-permissions")).to have_selector(".project-feature-toggle.is-disabled", count: 2)
     end
 
     it "shows empty features project homepage" do