Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

3 files changed, 87 insertions, 1 deletions

diff --git a/spec/finders/packages/build_infos_finder_spec.rb b/spec/finders/packages/build_infos_finder_spec.rb
new file mode 100644
index 00000000000..23425de4316
--- /dev/null
+++ b/spec/finders/packages/build_infos_finder_spec.rb
@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe ::Packages::BuildInfosFinder do
+  using RSpec::Parameterized::TableSyntax
+
+  let_it_be(:package) { create(:package) }
+  let_it_be(:build_infos) { create_list(:package_build_info, 5, :with_pipeline, package: package) }
+  let_it_be(:build_info_with_empty_pipeline) { create(:package_build_info, package: package) }
+
+  let(:finder) { described_class.new(package, params) }
+  let(:params) do
+    {
+      first: first,
+      last: last,
+      after: after,
+      before: before,
+      max_page_size: max_page_size,
+      support_next_page: support_next_page
+    }
+  end
+
+  describe '#execute' do
+    subject { finder.execute }
+
+    where(:first, :last, :after_index, :before_index, :max_page_size, :support_next_page, :expected_build_infos_indexes) do
+      # F   L     AI    BI    MPS   SNP
+      nil | nil | nil | nil | nil | false | [4, 3, 2, 1, 0]
+      nil | nil | nil | nil | 10  | false | [4, 3, 2, 1, 0]
+      nil | nil | nil | nil | 2   | false | [4, 3]
+      2   | nil | nil | nil | nil | false | [4, 3]
+      2   | nil | nil | nil | nil | true  | [4, 3, 2]
+      2   | nil | 3   | nil | nil | false | [2, 1]
+      2   | nil | 3   | nil | nil | true  | [2, 1, 0]
+      3   | nil | 4   | nil | 2   | false | [3, 2]
+      3   | nil | 4   | nil | 2   | true  | [3, 2, 1]
+      nil | 2   | nil | nil | nil | false | [0, 1]
+      nil | 2   | nil | nil | nil | true  | [0, 1, 2]
+      nil | 2   | nil | 1   | nil | false | [2, 3]
+      nil | 2   | nil | 1   | nil | true  | [2, 3, 4]
+      nil | 3   | nil | 0   | 2   | false | [1, 2]
+      nil | 3   | nil | 0   | 2   | true  | [1, 2, 3]
+    end
+
+    with_them do
+      let(:expected_build_infos) do
+        expected_build_infos_indexes.map do |idx|
+          build_infos[idx]
+        end
+      end
+
+      let(:after) do
+        build_infos[after_index].pipeline_id if after_index
+      end
+
+      let(:before) do
+        build_infos[before_index].pipeline_id if before_index
+      end
+
+      it { is_expected.to eq(expected_build_infos) }
+    end
+  end
+end
diff --git a/spec/finders/packages/group_packages_finder_spec.rb b/spec/finders/packages/group_packages_finder_spec.rb
index 3254c436674..c2dbfb59eb2 100644
--- a/spec/finders/packages/group_packages_finder_spec.rb
+++ b/spec/finders/packages/group_packages_finder_spec.rb
@@ -107,6 +107,28 @@ RSpec.describe Packages::GroupPackagesFinder do
           end
         end
 
+        context 'deploy tokens' do
+          let(:add_user_to_group) { false }
+
+          context 'group deploy token' do
+            let_it_be(:deploy_token_for_group) { create(:deploy_token, :group, read_package_registry: true) }
+            let_it_be(:group_deploy_token) { create(:group_deploy_token, deploy_token: deploy_token_for_group, group: group) }
+
+            let(:user) { deploy_token_for_group }
+
+            it { is_expected.to match_array([package1, package2, package4]) }
+          end
+
+          context 'project deploy token' do
+            let_it_be(:deploy_token_for_project) { create(:deploy_token, read_package_registry: true) }
+            let_it_be(:project_deploy_token) { create(:project_deploy_token, deploy_token: deploy_token_for_project, project: subproject) }
+
+            let(:user) { deploy_token_for_project }
+
+            it { is_expected.to match_array([package4]) }
+          end
+        end
+
         context 'avoid N+1 query' do
           it 'avoids N+1 database queries' do
             count = ActiveRecord::QueryRecorder.new { subject }
diff --git a/spec/finders/packages/nuget/package_finder_spec.rb b/spec/finders/packages/nuget/package_finder_spec.rb
index 4ad02ce7da8..045dba295ac 100644
--- a/spec/finders/packages/nuget/package_finder_spec.rb
+++ b/spec/finders/packages/nuget/package_finder_spec.rb
@@ -71,7 +71,7 @@ RSpec.describe Packages::Nuget::PackageFinder do
       end
 
       context 'with prefix wildcard' do
-        let(:package_name) { "%#{package1.name[3..-1]}" }
+        let(:package_name) { "%#{package1.name[3..]}" }
 
         it { is_expected.to match_array([package1, package2]) }
       end