Add latest changes from gitlab-org/gitlab@13-12-stable-eev13.12.0-rc42

13 files changed, 238 insertions, 62 deletions

diff --git a/spec/finders/packages/composer/packages_finder_spec.rb b/spec/finders/packages/composer/packages_finder_spec.rb
new file mode 100644
index 00000000000..d4328827de3
--- /dev/null
+++ b/spec/finders/packages/composer/packages_finder_spec.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+require 'spec_helper'
+
+RSpec.describe ::Packages::Composer::PackagesFinder do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+
+  let(:params) { {} }
+
+  describe '#execute' do
+    let_it_be(:composer_package) { create(:composer_package, project: project) }
+    let_it_be(:composer_package2) { create(:composer_package, project: project) }
+    let_it_be(:error_package) { create(:composer_package, :error, project: project) }
+    let_it_be(:composer_package3) { create(:composer_package) }
+
+    subject { described_class.new(user, group, params).execute }
+
+    before do
+      project.add_developer(user)
+    end
+
+    it { is_expected.to match_array([composer_package, composer_package2]) }
+  end
+end
diff --git a/spec/finders/packages/conan/package_finder_spec.rb b/spec/finders/packages/conan/package_finder_spec.rb
index 936a0e5ff4b..b26f8900090 100644
--- a/spec/finders/packages/conan/package_finder_spec.rb
+++ b/spec/finders/packages/conan/package_finder_spec.rb
@@ -11,7 +11,8 @@ RSpec.describe ::Packages::Conan::PackageFinder do
 
     subject { described_class.new(user, query: query).execute }
 
-    context 'packages that are not visible to user' do
+    context 'packages that are not installable' do
+      let!(:conan_package3) { create(:conan_package, :error, project: project) }
       let!(:non_visible_project) { create(:project, :private) }
       let!(:non_visible_conan_package) { create(:conan_package, project: non_visible_project) }
       let(:query) { "#{conan_package.name.split('/').first[0, 3]}%" }
diff --git a/spec/finders/packages/generic/package_finder_spec.rb b/spec/finders/packages/generic/package_finder_spec.rb
index ed34268e7a9..707f943b285 100644
--- a/spec/finders/packages/generic/package_finder_spec.rb
+++ b/spec/finders/packages/generic/package_finder_spec.rb
@@ -23,6 +23,13 @@ RSpec.describe ::Packages::Generic::PackageFinder do
       expect(found_package).to eq(package)
     end
 
+    it 'does not find uninstallable packages' do
+      error_package = create(:generic_package, :error, project: project)
+
+      expect { finder.execute!(error_package.name, error_package.version) }
+        .to raise_error(ActiveRecord::RecordNotFound)
+    end
+
     it 'raises ActiveRecord::RecordNotFound if package is not found' do
       expect { finder.execute!(package.name, '3.1.4') }
         .to raise_error(ActiveRecord::RecordNotFound)
diff --git a/spec/finders/packages/go/package_finder_spec.rb b/spec/finders/packages/go/package_finder_spec.rb
index b6fad1e7061..dbcb8255d47 100644
--- a/spec/finders/packages/go/package_finder_spec.rb
+++ b/spec/finders/packages/go/package_finder_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe Packages::Go::PackageFinder do
 
   let_it_be(:mod) { create :go_module, project: project }
   let_it_be(:version) { create :go_module_version, :tagged, mod: mod, name: 'v1.0.1' }
-  let_it_be(:package) { create :golang_package, project: project, name: mod.name, version: 'v1.0.1' }
+  let_it_be_with_refind(:package) { create :golang_package, project: project, name: mod.name, version: 'v1.0.1' }
 
   let(:finder) { described_class.new(project, mod_name, version_name) }
 
@@ -54,6 +54,17 @@ RSpec.describe Packages::Go::PackageFinder do
       it { is_expected.to eq(package) }
     end
 
+    context 'with an uninstallable package' do
+      let(:mod_name) { mod.name }
+      let(:version_name) { version.name }
+
+      before do
+        package.update_column(:status, 1)
+      end
+
+      it { is_expected.to eq(nil) }
+    end
+
     context 'with an invalid name' do
       let(:mod_name) { 'foo/bar' }
       let(:version_name) { 'baz' }
diff --git a/spec/finders/packages/group_or_project_package_finder_spec.rb b/spec/finders/packages/group_or_project_package_finder_spec.rb
new file mode 100644
index 00000000000..aaeec8e70d2
--- /dev/null
+++ b/spec/finders/packages/group_or_project_package_finder_spec.rb
@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::GroupOrProjectPackageFinder do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+
+  let(:finder) { described_class.new(user, project) }
+
+  describe 'execute' do
+    subject(:run_finder) { finder.execute }
+
+    it { expect { run_finder }.to raise_error(NotImplementedError) }
+  end
+
+  describe 'execute!' do
+    subject(:run_finder) { finder.execute! }
+
+    it { expect { run_finder }.to raise_error(NotImplementedError) }
+  end
+end
diff --git a/spec/finders/packages/group_packages_finder_spec.rb b/spec/finders/packages/group_packages_finder_spec.rb
index d6daf73aba2..29b2f0fffd7 100644
--- a/spec/finders/packages/group_packages_finder_spec.rb
+++ b/spec/finders/packages/group_packages_finder_spec.rb
@@ -122,7 +122,7 @@ RSpec.describe Packages::GroupPackagesFinder do
       end
 
       context 'when there are processing packages' do
-        let_it_be(:package4) { create(:nuget_package, project: project, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
+        let_it_be(:package4) { create(:nuget_package, :processing, project: project) }
 
         it { is_expected.to match_array([package1, package2]) }
       end
diff --git a/spec/finders/packages/maven/package_finder_spec.rb b/spec/finders/packages/maven/package_finder_spec.rb
index ca144292501..13c603f1ec4 100644
--- a/spec/finders/packages/maven/package_finder_spec.rb
+++ b/spec/finders/packages/maven/package_finder_spec.rb
@@ -6,13 +6,12 @@ RSpec.describe ::Packages::Maven::PackageFinder do
   let_it_be(:user)    { create(:user) }
   let_it_be(:group)   { create(:group) }
   let_it_be(:project) { create(:project, namespace: group) }
-  let_it_be(:package) { create(:maven_package, project: project) }
+  let_it_be_with_refind(:package) { create(:maven_package, project: project) }
 
   let(:param_path) { nil }
-  let(:param_project) { nil }
-  let(:param_group) { nil }
+  let(:project_or_group) { nil }
   let(:param_order_by_package_file) { false }
-  let(:finder) { described_class.new(param_path, user, project: param_project, group: param_group, order_by_package_file: param_order_by_package_file) }
+  let(:finder) { described_class.new(user, project_or_group, path: param_path, order_by_package_file: param_order_by_package_file) }
 
   before do
     group.add_developer(user)
@@ -36,34 +35,28 @@ RSpec.describe ::Packages::Maven::PackageFinder do
             expect { subject }.to raise_error(ActiveRecord::RecordNotFound)
           end
         end
+
+        context 'with an uninstallable package' do
+          let(:param_path) { package.maven_metadatum.path }
+
+          before do
+            package.update_column(:status, 1)
+          end
+
+          it { expect { subject }.to raise_error(ActiveRecord::RecordNotFound) }
+        end
       end
 
       context 'within the project' do
-        let(:param_project) { project }
+        let(:project_or_group) { project }
 
         it_behaves_like 'handling valid and invalid paths'
       end
 
       context 'within a group' do
-        let(:param_group) { group }
-
-        context 'with maven_packages_group_level_improvements enabled' do
-          before do
-            stub_feature_flags(maven_packages_group_level_improvements: true)
-            expect(finder).to receive(:packages_visible_to_user).with(user, within_group: group).and_call_original
-          end
-
-          it_behaves_like 'handling valid and invalid paths'
-        end
-
-        context 'with maven_packages_group_level_improvements disabled' do
-          before do
-            stub_feature_flags(maven_packages_group_level_improvements: false)
-            expect(finder).not_to receive(:packages_visible_to_user)
-          end
+        let(:project_or_group) { group }
 
-          it_behaves_like 'handling valid and invalid paths'
-        end
+        it_behaves_like 'handling valid and invalid paths'
       end
 
       context 'across all projects' do
@@ -83,7 +76,7 @@ RSpec.describe ::Packages::Maven::PackageFinder do
         let_it_be(:package2) { create(:maven_package, project: project2, name: package_name, version: nil) }
         let_it_be(:package3) { create(:maven_package, project: project3, name: package_name, version: nil) }
 
-        let(:param_group) { group }
+        let(:project_or_group) { group }
         let(:param_path) { package_name }
 
         before do
@@ -93,38 +86,14 @@ RSpec.describe ::Packages::Maven::PackageFinder do
           create(:package_file, :xml, package: package2)
         end
 
-        context 'with maven_packages_group_level_improvements enabled' do
-          before do
-            stub_feature_flags(maven_packages_group_level_improvements: true)
-            expect(finder).not_to receive(:versionless_package?)
-          end
-
-          context 'without order by package file' do
-            it { is_expected.to eq(package3) }
-          end
-
-          context 'with order by package file' do
-            let(:param_order_by_package_file) { true }
-
-            it { is_expected.to eq(package2) }
-          end
+        context 'without order by package file' do
+          it { is_expected.to eq(package3) }
         end
 
-        context 'with maven_packages_group_level_improvements disabled' do
-          before do
-            stub_feature_flags(maven_packages_group_level_improvements: false)
-            expect(finder).to receive(:versionless_package?).and_call_original
-          end
+        context 'with order by package file' do
+          let(:param_order_by_package_file) { true }
 
-          context 'without order by package file' do
-            it { is_expected.to eq(package2) }
-          end
-
-          context 'with order by package file' do
-            let(:param_order_by_package_file) { true }
-
-            it { is_expected.to eq(package2) }
-          end
+          it { is_expected.to eq(package2) }
         end
       end
     end
@@ -146,7 +115,7 @@ RSpec.describe ::Packages::Maven::PackageFinder do
     it_behaves_like 'Packages::Maven::PackageFinder examples'
 
     it 'uses CTE in the query' do
-      sql = described_class.new('some_path', user, group: group).send(:packages_with_path).to_sql
+      sql = described_class.new(user, group, path: package.maven_metadatum.path).send(:packages).to_sql
 
       expect(sql).to include('WITH "maven_metadata_by_path" AS')
     end
diff --git a/spec/finders/packages/npm/package_finder_spec.rb b/spec/finders/packages/npm/package_finder_spec.rb
index f021d800f31..a995f3b96c4 100644
--- a/spec/finders/packages/npm/package_finder_spec.rb
+++ b/spec/finders/packages/npm/package_finder_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 
 RSpec.describe ::Packages::Npm::PackageFinder do
   let_it_be_with_reload(:project) { create(:project)}
-  let_it_be(:package) { create(:npm_package, project: project) }
+  let_it_be_with_refind(:package) { create(:npm_package, project: project) }
 
   let(:project) { package.project }
   let(:package_name) { package.name }
@@ -46,6 +46,14 @@ RSpec.describe ::Packages::Npm::PackageFinder do
 
         it { is_expected.to be_empty }
       end
+
+      context 'with an uninstallable package' do
+        before do
+          package.update_column(:status, 1)
+        end
+
+        it { is_expected.to be_empty }
+      end
     end
 
     subject { finder.execute }
diff --git a/spec/finders/packages/nuget/package_finder_spec.rb b/spec/finders/packages/nuget/package_finder_spec.rb
index 10b5f6c8ec2..59cca2d06dc 100644
--- a/spec/finders/packages/nuget/package_finder_spec.rb
+++ b/spec/finders/packages/nuget/package_finder_spec.rb
@@ -6,7 +6,7 @@ RSpec.describe Packages::Nuget::PackageFinder do
   let_it_be(:group) { create(:group) }
   let_it_be(:subgroup) { create(:group, parent: group) }
   let_it_be(:project) { create(:project, namespace: subgroup) }
-  let_it_be(:package1) { create(:nuget_package, project: project) }
+  let_it_be_with_refind(:package1) { create(:nuget_package, project: project) }
   let_it_be(:package2) { create(:nuget_package, name: package1.name, version: '2.0.0', project: project) }
   let_it_be(:package3) { create(:nuget_package, name: 'Another.Dummy.Package', project: project) }
   let_it_be(:other_package_1) { create(:nuget_package, name: package1.name, version: package1.version) }
@@ -33,6 +33,14 @@ RSpec.describe Packages::Nuget::PackageFinder do
         it { is_expected.to be_empty }
       end
 
+      context 'with an uninstallable package' do
+        before do
+          package1.update_column(:status, 1)
+        end
+
+        it { is_expected.to contain_exactly(package2) }
+      end
+
       context 'with valid version' do
         let(:package_version) { '2.0.0' }
 
diff --git a/spec/finders/packages/package_finder_spec.rb b/spec/finders/packages/package_finder_spec.rb
index e8c7404a612..2bb4f05a41d 100644
--- a/spec/finders/packages/package_finder_spec.rb
+++ b/spec/finders/packages/package_finder_spec.rb
@@ -4,7 +4,7 @@ require 'spec_helper'
 
 RSpec.describe ::Packages::PackageFinder do
   let_it_be(:project) { create(:project) }
-  let_it_be(:maven_package) { create(:maven_package, project: project) }
+  let_it_be_with_refind(:maven_package) { create(:maven_package, project: project) }
 
   describe '#execute' do
     let(:package_id) { maven_package.id }
@@ -13,8 +13,18 @@ RSpec.describe ::Packages::PackageFinder do
 
     it { is_expected.to eq(maven_package) }
 
+    context 'with non-displayable package' do
+      before do
+        maven_package.update_column(:status, 1)
+      end
+
+      it 'raises an exception' do
+        expect { subject }.to raise_exception(ActiveRecord::RecordNotFound)
+      end
+    end
+
     context 'processing packages' do
-      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
+      let_it_be(:nuget_package) { create(:nuget_package, :processing, project: project) }
       let(:package_id) { nuget_package.id }
 
       it 'are not returned' do
diff --git a/spec/finders/packages/packages_finder_spec.rb b/spec/finders/packages/packages_finder_spec.rb
index 0add77a8478..b72f4aab3ec 100644
--- a/spec/finders/packages/packages_finder_spec.rb
+++ b/spec/finders/packages/packages_finder_spec.rb
@@ -76,7 +76,7 @@ RSpec.describe ::Packages::PackagesFinder do
     end
 
     context 'with processing packages' do
-      let_it_be(:nuget_package) { create(:nuget_package, project: project, name: Packages::Nuget::TEMPORARY_PACKAGE_NAME) }
+      let_it_be(:nuget_package) { create(:nuget_package, :processing, project: project) }
 
       it { is_expected.to match_array([conan_package, maven_package]) }
     end
diff --git a/spec/finders/packages/pypi/package_finder_spec.rb b/spec/finders/packages/pypi/package_finder_spec.rb
new file mode 100644
index 00000000000..7d9eb8a5cd1
--- /dev/null
+++ b/spec/finders/packages/pypi/package_finder_spec.rb
@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::Pypi::PackageFinder do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:project2) { create(:project, group: group) }
+  let_it_be(:package1) { create(:pypi_package, project: project) }
+  let_it_be(:package2) { create(:pypi_package, project: project) }
+  let_it_be(:package3) { create(:pypi_package, project: project2) }
+
+  let(:package_file) { package2.package_files.first }
+  let(:params) do
+    {
+      filename: package_file.file_name,
+      sha256: package_file.file_sha256
+    }
+  end
+
+  describe 'execute' do
+    subject { described_class.new(user, scope, params).execute }
+
+    context 'within a project' do
+      let(:scope) { project }
+
+      it { is_expected.to eq(package2) }
+    end
+
+    context 'within a group' do
+      let(:scope) { group }
+
+      it { expect { subject }.to raise_error(ActiveRecord::RecordNotFound) }
+
+      context 'user with access' do
+        before do
+          project.add_developer(user)
+        end
+
+        it { is_expected.to eq(package2) }
+      end
+    end
+  end
+end
diff --git a/spec/finders/packages/pypi/packages_finder_spec.rb b/spec/finders/packages/pypi/packages_finder_spec.rb
new file mode 100644
index 00000000000..a69c2317261
--- /dev/null
+++ b/spec/finders/packages/pypi/packages_finder_spec.rb
@@ -0,0 +1,70 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::Pypi::PackagesFinder do
+  let_it_be(:user) { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:project2) { create(:project, group: group) }
+  let_it_be(:package1) { create(:pypi_package, project: project) }
+  let_it_be(:package2) { create(:pypi_package, project: project) }
+  let_it_be(:package3) { create(:pypi_package, name: package2.name, project: project) }
+  let_it_be(:package4) { create(:pypi_package, name: package2.name, project: project2) }
+
+  let(:package_name) { package2.name }
+
+  describe 'execute!' do
+    subject { described_class.new(user, scope, package_name: package_name).execute! }
+
+    shared_examples 'when no package is found' do
+      context 'non-existing package' do
+        let(:package_name) { 'none' }
+
+        it { expect { subject }.to raise_error(ActiveRecord::RecordNotFound) }
+      end
+    end
+
+    shared_examples 'when package_name param is a non-normalized name' do
+      context 'non-existing package' do
+        let(:package_name) { package2.name.upcase.tr('-', '.') }
+
+        it { expect { subject }.to raise_error(ActiveRecord::RecordNotFound) }
+      end
+    end
+
+    context 'within a project' do
+      let(:scope) { project }
+
+      it { is_expected.to contain_exactly(package2, package3) }
+
+      it_behaves_like 'when no package is found'
+      it_behaves_like 'when package_name param is a non-normalized name'
+    end
+
+    context 'within a group' do
+      let(:scope) { group }
+
+      it { expect { subject }.to raise_error(ActiveRecord::RecordNotFound) }
+
+      context 'user with access to only one project' do
+        before do
+          project2.add_developer(user)
+        end
+
+        it { is_expected.to contain_exactly(package4) }
+
+        it_behaves_like 'when no package is found'
+        it_behaves_like 'when package_name param is a non-normalized name'
+
+        context ' user with access to multiple projects' do
+          before do
+            project.add_developer(user)
+          end
+
+          it { is_expected.to contain_exactly(package2, package3, package4) }
+        end
+      end
+    end
+  end
+end