Render 404 for packages pages when feature is not allowed by license

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

ee/app/controllers/concerns/packages_access.rb

@@ -11,6 +11,7 @@ module PackagesAccess
   private
 
   def verify_packages_enabled!
-    render_404 unless Gitlab.config.packages.enabled
+    render_404 unless Gitlab.config.packages.enabled &&
+        project.feature_available?(:packages)
   end
 end

ee/spec/features/projects/package_files_spec.rb

@@ -10,6 +10,7 @@ describe 'PackageFiles' do
 
   before do
     sign_in(user)
+    stub_licensed_features(packages: true)
   end
 
   context 'user with master role' do
@@ -41,6 +42,14 @@ describe 'PackageFiles' do
 
       expect(status_code).to eq(404)
     end
+
+    it 'gives 404 when packages feature is not available' do
+      stub_licensed_features(packages: false)
+
+      visit download_project_package_file_path(project, package_file)
+
+      expect(status_code).to eq(404)
+    end
   end
 
   it 'does not allow direct download when no access to the project' do

ee/spec/features/projects/packages_spec.rb

@@ -9,6 +9,31 @@ describe 'Packages' do
   before do
     sign_in(user)
     project.add_master(user)
+    stub_licensed_features(packages: true)
+  end
+
+  context 'packages feature is not available because of license' do
+    before do
+      stub_licensed_features(packages: false)
+    end
+
+    it 'gives 404' do
+      visit_project_packages
+
+      expect(status_code).to eq(404)
+    end
+  end
+
+  context 'packages feature is disabled by config' do
+    before do
+      allow(Gitlab.config.packages).to receive(:enabled).and_return(false)
+    end
+
+    it 'gives 404' do
+      visit_project_packages
+
+      expect(status_code).to eq(404)
+    end
   end
 
   context 'when there are no packages' do