Add latest changes from gitlab-org/gitlab@16-7-stable-eev16.7.0-rc42

1 files changed, 17 insertions, 1 deletions

diff --git a/spec/models/ci/pipeline_metadata_spec.rb b/spec/models/ci/pipeline_metadata_spec.rb
index 977c90bcc2a..1a426118063 100644
--- a/spec/models/ci/pipeline_metadata_spec.rb
+++ b/spec/models/ci/pipeline_metadata_spec.rb
@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-RSpec.describe Ci::PipelineMetadata do
+RSpec.describe Ci::PipelineMetadata, feature_category: :pipeline_composition do
   it { is_expected.to belong_to(:project) }
   it { is_expected.to belong_to(:pipeline) }
 
@@ -10,5 +10,21 @@ RSpec.describe Ci::PipelineMetadata do
     it { is_expected.to validate_length_of(:name).is_at_least(1).is_at_most(255) }
     it { is_expected.to validate_presence_of(:project) }
     it { is_expected.to validate_presence_of(:pipeline) }
+
+    it do
+      is_expected.to define_enum_for(
+        :auto_cancel_on_new_commit
+      ).with_values(
+        conservative: 0, interruptible: 1, disabled: 2
+      ).with_prefix
+    end
+
+    it do
+      is_expected.to define_enum_for(
+        :auto_cancel_on_job_failure
+      ).with_values(
+        none: 0, all: 1
+      ).with_prefix
+    end
   end
 end