Add latest changes from gitlab-org/gitlab@master

5 files changed, 53 insertions, 1 deletions

diff --git a/spec/factories/packages/package_protection_rules.rb b/spec/factories/packages/package_protection_rules.rb
new file mode 100644
index 00000000000..3038fb847e7
--- /dev/null
+++ b/spec/factories/packages/package_protection_rules.rb
@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+FactoryBot.define do
+  factory :package_protection_rule, class: 'Packages::Protection::Rule' do
+    project
+    package_name_pattern { '@my_scope/my_package' }
+    package_type { :npm }
+    push_protected_up_to_access_level { Gitlab::Access::DEVELOPER }
+  end
+end
diff --git a/spec/lib/gitlab/import_export/all_models.yml b/spec/lib/gitlab/import_export/all_models.yml
index de3f28a5b90..5ca5270a851 100644
--- a/spec/lib/gitlab/import_export/all_models.yml
+++ b/spec/lib/gitlab/import_export/all_models.yml
@@ -738,6 +738,7 @@ project:
 - project_registry
 - packages
 - package_files
+- package_protection_rules
 - rpm_repository_files
 - npm_metadata_caches
 - packages_cleanup_policy
diff --git a/spec/models/packages/protection/rule_spec.rb b/spec/models/packages/protection/rule_spec.rb
new file mode 100644
index 00000000000..b368687e6d8
--- /dev/null
+++ b/spec/models/packages/protection/rule_spec.rb
@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Packages::Protection::Rule, type: :model, feature_category: :package_registry do
+  it_behaves_like 'having unique enum values'
+
+  describe 'relationships' do
+    it { is_expected.to belong_to(:project).inverse_of(:package_protection_rules) }
+  end
+
+  describe 'enums' do
+    describe '#package_type' do
+      it { is_expected.to define_enum_for(:package_type).with_values(npm: Packages::Package.package_types[:npm]) }
+    end
+  end
+
+  describe 'validations' do
+    subject { build(:package_protection_rule) }
+
+    describe '#package_name_pattern' do
+      it { is_expected.to validate_presence_of(:package_name_pattern) }
+      it { is_expected.to validate_uniqueness_of(:package_name_pattern).scoped_to(:project_id, :package_type) }
+      it { is_expected.to validate_length_of(:package_name_pattern).is_at_most(255) }
+    end
+
+    describe '#package_type' do
+      it { is_expected.to validate_presence_of(:package_type) }
+    end
+
+    describe '#push_protected_up_to_access_level' do
+      it { is_expected.to validate_presence_of(:push_protected_up_to_access_level) }
+
+      it {
+        is_expected.to validate_inclusion_of(:push_protected_up_to_access_level).in_array([Gitlab::Access::DEVELOPER,
+          Gitlab::Access::MAINTAINER, Gitlab::Access::OWNER])
+      }
+    end
+  end
+end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index db5b5c914c9..6193a565d76 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -152,6 +152,7 @@ RSpec.describe Project, factory_default: :keep, feature_category: :groups_and_pr
     it { is_expected.to have_many(:debian_distributions).class_name('Packages::Debian::ProjectDistribution').dependent(:destroy) }
     it { is_expected.to have_many(:npm_metadata_caches).class_name('Packages::Npm::MetadataCache') }
     it { is_expected.to have_one(:packages_cleanup_policy).class_name('Packages::Cleanup::Policy').inverse_of(:project) }
+    it { is_expected.to have_many(:package_protection_rules).class_name('Packages::Protection::Rule').inverse_of(:project) }
     it { is_expected.to have_many(:pipeline_artifacts).dependent(:restrict_with_error) }
     it { is_expected.to have_many(:terraform_states).class_name('Terraform::State').inverse_of(:project) }
     it { is_expected.to have_many(:timelogs) }
diff --git a/spec/policies/packages/policies/project_policy_spec.rb b/spec/policies/packages/policies/project_policy_spec.rb
index fde10f64be8..1f8a653f984 100644
--- a/spec/policies/packages/policies/project_policy_spec.rb
+++ b/spec/policies/packages/policies/project_policy_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Packages::Policies::ProjectPolicy do
+RSpec.describe Packages::Policies::ProjectPolicy, feature_category: :package_registry do
   include_context 'ProjectPolicy context'
 
   let(:project) { public_project }