Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43

1 files changed, 16 insertions, 4 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules_spec.rb
index 4ae51ac8bf9..e30a78546af 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/evaluate_workflow_rules_spec.rb
@@ -16,8 +16,10 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::EvaluateWorkflowRules do
   describe '#perform!' do
     context 'when pipeline has been skipped by workflow configuration' do
       before do
-        allow(step).to receive(:workflow_passed?)
-          .and_return(false)
+        allow(step).to receive(:workflow_rules_result)
+          .and_return(
+            double(pass?: false, variables: {})
+          )
 
         step.perform!
       end
@@ -33,12 +35,18 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::EvaluateWorkflowRules do
       it 'attaches an error to the pipeline' do
         expect(pipeline.errors[:base]).to include('Pipeline filtered out by workflow rules.')
       end
+
+      it 'saves workflow_rules_result' do
+        expect(command.workflow_rules_result.variables).to eq({})
+      end
     end
 
     context 'when pipeline has not been skipped by workflow configuration' do
       before do
-        allow(step).to receive(:workflow_passed?)
-          .and_return(true)
+        allow(step).to receive(:workflow_rules_result)
+          .and_return(
+            double(pass?: true, variables: { 'VAR1' => 'val2' })
+          )
 
         step.perform!
       end
@@ -55,6 +63,10 @@ RSpec.describe Gitlab::Ci::Pipeline::Chain::EvaluateWorkflowRules do
       it 'attaches no errors' do
         expect(pipeline.errors).to be_empty
       end
+
+      it 'saves workflow_rules_result' do
+        expect(command.workflow_rules_result.variables).to eq({ 'VAR1' => 'val2' })
+      end
     end
   end
 end