Add latest changes from gitlab-org/gitlab@master

1 files changed, 22 insertions, 2 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb
index e4768f2ef0d..ae427eaf403 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/skip_spec.rb
@@ -21,17 +21,37 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::Skip do
     before do
       allow(pipeline).to receive(:git_commit_message)
         .and_return('commit message [ci skip]')
-
-      step.perform!
     end
 
     it 'breaks the chain' do
+      step.perform!
+
       expect(step.break?).to be true
     end
 
     it 'skips the pipeline' do
+      step.perform!
+
       expect(pipeline.reload).to be_skipped
     end
+
+    it 'calls ensure_project_iid explicitly' do
+      expect(pipeline).to receive(:ensure_project_iid!)
+
+      step.perform!
+    end
+
+    context 'when the ci_pipeline_ensure_iid_on_save feature flag is off' do
+      before do
+        stub_feature_flags(ci_pipeline_ensure_iid_on_skip: false)
+      end
+
+      it 'does not call ensure_project_iid explicitly' do
+        expect(pipeline).not_to receive(:ensure_project_iid!)
+
+        step.perform!
+      end
+    end
   end
 
   context 'when pipeline has not been skipped' do