Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

4 files changed, 8 insertions, 7 deletions

diff --git a/spec/models/packages/cleanup/policy_spec.rb b/spec/models/packages/cleanup/policy_spec.rb
index a37042520e7..0b6dff472c1 100644
--- a/spec/models/packages/cleanup/policy_spec.rb
+++ b/spec/models/packages/cleanup/policy_spec.rb
@@ -9,6 +9,7 @@ RSpec.describe Packages::Cleanup::Policy, type: :model do
 
   describe 'validations' do
     it { is_expected.to validate_presence_of(:project) }
+
     it do
       is_expected
         .to validate_inclusion_of(:keep_n_duplicated_package_files)
diff --git a/spec/models/packages/conan/metadatum_spec.rb b/spec/models/packages/conan/metadatum_spec.rb
index d00723e8e43..92c8b126639 100644
--- a/spec/models/packages/conan/metadatum_spec.rb
+++ b/spec/models/packages/conan/metadatum_spec.rb
@@ -10,7 +10,7 @@ RSpec.describe Packages::Conan::Metadatum, type: :model do
   end
 
   describe 'validations' do
-    let(:fifty_one_characters) { 'f_a' * 17}
+    let(:fifty_one_characters) { 'f_a' * 17 }
 
     it { is_expected.to validate_presence_of(:package) }
     it { is_expected.to validate_presence_of(:package_username) }
diff --git a/spec/models/packages/package_file_spec.rb b/spec/models/packages/package_file_spec.rb
index 82f5b44f38f..9554fc3bb1b 100644
--- a/spec/models/packages/package_file_spec.rb
+++ b/spec/models/packages/package_file_spec.rb
@@ -126,7 +126,7 @@ RSpec.describe Packages::PackageFile, type: :model do
   describe '.with_conan_package_reference' do
     let_it_be(:non_matching_package_file) { create(:package_file, :nuget) }
     let_it_be(:metadatum) { create(:conan_file_metadatum, :package_file) }
-    let_it_be(:reference) { metadatum.conan_package_reference}
+    let_it_be(:reference) { metadatum.conan_package_reference }
 
     it 'returns matching packages' do
       expect(described_class.with_conan_package_reference(reference))
@@ -150,8 +150,8 @@ RSpec.describe Packages::PackageFile, type: :model do
 
   context 'Debian scopes' do
     let_it_be(:debian_changes) { debian_package.package_files.last }
-    let_it_be(:debian_deb) { create(:debian_package_file, package: debian_package)}
-    let_it_be(:debian_udeb) { create(:debian_package_file, :udeb, package: debian_package)}
+    let_it_be(:debian_deb) { create(:debian_package_file, package: debian_package) }
+    let_it_be(:debian_udeb) { create(:debian_package_file, :udeb, package: debian_package) }
 
     let_it_be(:debian_contrib) do
       create(:debian_package_file, package: debian_package).tap do |pf|
diff --git a/spec/models/packages/package_spec.rb b/spec/models/packages/package_spec.rb
index 06f02f021cf..526c57d08b0 100644
--- a/spec/models/packages/package_spec.rb
+++ b/spec/models/packages/package_spec.rb
@@ -131,7 +131,7 @@ RSpec.describe Packages::Package, type: :model do
       context 'conan package' do
         subject { build_stubbed(:conan_package) }
 
-        let(:fifty_one_characters) {'f_b' * 17}
+        let(:fifty_one_characters) { 'f_b' * 17 }
 
         it { is_expected.to allow_value('foo+bar').for(:name) }
         it { is_expected.to allow_value('foo_bar').for(:name) }
@@ -243,7 +243,7 @@ RSpec.describe Packages::Package, type: :model do
       context 'conan package' do
         subject { build_stubbed(:conan_package) }
 
-        let(:fifty_one_characters) {'1.2' * 17}
+        let(:fifty_one_characters) { '1.2' * 17 }
 
         it { is_expected.to allow_value('1.2').for(:version) }
         it { is_expected.to allow_value('1.2.3-beta').for(:version) }
@@ -441,7 +441,7 @@ RSpec.describe Packages::Package, type: :model do
       context 'npm package' do
         let_it_be(:group) { create(:group) }
         let_it_be(:project) { create(:project, namespace: group) }
-        let_it_be(:second_project) { create(:project, namespace: group)}
+        let_it_be(:second_project) { create(:project, namespace: group) }
 
         let(:package) { build(:npm_package, project: project, name: name) }