Add latest changes from gitlab-org/gitlab@master

2 files changed, 79 insertions, 10 deletions

diff --git a/spec/presenters/packages/pypi/simple_index_presenter_spec.rb b/spec/presenters/packages/pypi/simple_index_presenter_spec.rb
new file mode 100644
index 00000000000..d915706577f
--- /dev/null
+++ b/spec/presenters/packages/pypi/simple_index_presenter_spec.rb
@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ::Packages::Pypi::SimpleIndexPresenter, :aggregate_failures do
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:group) { create(:group) }
+  let_it_be(:project) { create(:project, group: group) }
+  let_it_be(:package_name) { 'sample-project' }
+  let_it_be(:package1) { create(:pypi_package, project: project, name: package_name, version: '1.0.0') }
+  let_it_be(:package2) { create(:pypi_package, project: project, name: package_name, version: '2.0.0') }
+
+  let(:packages) { project.packages }
+
+  describe '#body' do
+    subject(:presenter) { described_class.new(packages, project_or_group).body }
+
+    shared_examples_for "pypi package presenter" do
+      where(:version, :expected_version) do
+        '>=2.7'                        | '>=2.7'
+        '"><script>alert(1)</script>'  | '&quot;&gt;&lt;script&gt;alert(1)&lt;/script&gt;'
+        '>=2.7, !=3.0'                 | '&gt;=2.7, !=3.0'
+      end
+
+      with_them do
+        let(:python_version) { version }
+        let(:expected_python_version) { expected_version }
+
+        before do
+          package1.pypi_metadatum.update_column(:required_python, python_version)
+          package2.pypi_metadatum.update_column(:required_python, '')
+        end
+
+        it 'contains links for all packages' do
+          expect(presenter).to include(expected_link1)
+          expect(presenter).to include(expected_link2)
+        end
+      end
+    end
+
+    context 'for project' do
+      let(:project_or_group) { project }
+      let(:expected_link1) { "<a href=\"http://localhost/api/v4/projects/#{project.id}/packages/pypi/simple/#{package1.normalized_pypi_name}\" data-requires-python=\"#{expected_python_version}\">#{package1.name}</a>" } # rubocop:disable Layout/LineLength
+      let(:expected_link2) { "<a href=\"http://localhost/api/v4/projects/#{project.id}/packages/pypi/simple/#{package2.normalized_pypi_name}\" data-requires-python=\"\">#{package2.name}</a>" } # rubocop:disable Layout/LineLength
+
+      it_behaves_like 'pypi package presenter'
+    end
+
+    context 'for group' do
+      let(:project_or_group) { group }
+      let(:expected_link1) { "<a href=\"http://localhost/api/v4/groups/#{group.id}/-/packages/pypi/simple/#{package1.normalized_pypi_name}\" data-requires-python=\"#{expected_python_version}\">#{package1.name}</a>" } # rubocop:disable Layout/LineLength
+      let(:expected_link2) { "<a href=\"http://localhost/api/v4/groups/#{group.id}/-/packages/pypi/simple/#{package2.normalized_pypi_name}\" data-requires-python=\"\">#{package2.name}</a>" } # rubocop:disable Layout/LineLength
+
+      it_behaves_like 'pypi package presenter'
+    end
+
+    context 'with package files pending destruction' do
+      let_it_be(:package_pending_destruction) do
+        create(:package, :pending_destruction, project: project, name: "package_pending_destruction")
+      end
+
+      let(:project_or_group) { project }
+
+      it { is_expected.not_to include(package_pending_destruction.name) }
+    end
+  end
+end
diff --git a/spec/presenters/packages/pypi/package_presenter_spec.rb b/spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb
index b19abdbc17a..be454e5168c 100644
--- a/spec/presenters/packages/pypi/package_presenter_spec.rb
+++ b/spec/presenters/packages/pypi/simple_package_versions_presenter_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe ::Packages::Pypi::PackagePresenter do
+RSpec.describe ::Packages::Pypi::SimplePackageVersionsPresenter, :aggregate_failures do
   using RSpec::Parameterized::TableSyntax
 
   let_it_be(:group) { create(:group) }
@@ -11,14 +11,13 @@ RSpec.describe ::Packages::Pypi::PackagePresenter do
   let_it_be(:package1) { create(:pypi_package, project: project, name: package_name, version: '1.0.0') }
   let_it_be(:package2) { create(:pypi_package, project: project, name: package_name, version: '2.0.0') }
 
-  let(:packages) { [package1, package2] }
-
   let(:file) { package.package_files.first }
   let(:filename) { file.file_name }
-
-  subject(:presenter) { described_class.new(packages, project_or_group).body}
+  let(:packages) { project.packages }
 
   describe '#body' do
+    subject(:presenter) { described_class.new(packages, project_or_group).body }
+
     shared_examples_for "pypi package presenter" do
       where(:version, :expected_version, :with_package1) do
         '>=2.7'                        | '&gt;=2.7'                                        | true
@@ -32,29 +31,31 @@ RSpec.describe ::Packages::Pypi::PackagePresenter do
         let(:package) { with_package1 ? package1 : package2 }
 
         before do
-          package.pypi_metadatum.required_python = python_version
+          package.pypi_metadatum.update_column(:required_python, python_version)
         end
 
-        it { is_expected.to include expected_file }
+        it { is_expected.to include expected_link }
       end
     end
 
     context 'for project' do
       let(:project_or_group) { project }
-      let(:expected_file) { "<a href=\"http://localhost/api/v4/projects/#{project.id}/packages/pypi/files/#{file.file_sha256}/#{filename}#sha256=#{file.file_sha256}\" data-requires-python=\"#{expected_python_version}\">#{filename}</a><br>" }
+      let(:expected_link) { "<a href=\"http://localhost/api/v4/projects/#{project.id}/packages/pypi/files/#{file.file_sha256}/#{filename}#sha256=#{file.file_sha256}\" data-requires-python=\"#{expected_python_version}\">#{filename}</a>" } # rubocop:disable Layout/LineLength
 
       it_behaves_like 'pypi package presenter'
     end
 
     context 'for group' do
       let(:project_or_group) { group }
-      let(:expected_file) { "<a href=\"http://localhost/api/v4/groups/#{group.id}/-/packages/pypi/files/#{file.file_sha256}/#{filename}#sha256=#{file.file_sha256}\" data-requires-python=\"#{expected_python_version}\">#{filename}</a><br>" }
+      let(:expected_link) { "<a href=\"http://localhost/api/v4/groups/#{group.id}/-/packages/pypi/files/#{file.file_sha256}/#{filename}#sha256=#{file.file_sha256}\" data-requires-python=\"#{expected_python_version}\">#{filename}</a>" } # rubocop:disable Layout/LineLength
 
       it_behaves_like 'pypi package presenter'
     end
 
     context 'with package files pending destruction' do
-      let_it_be(:package_file_pending_destruction) { create(:package_file, :pending_destruction, package: package1, file_name: "package_file_pending_destruction") }
+      let_it_be(:package_file_pending_destruction) do
+        create(:package_file, :pending_destruction, package: package1, file_name: "package_file_pending_destruction")
+      end
 
       let(:project_or_group) { project }