Add latest changes from gitlab-org/gitlab@14-6-stable-eev14.6.0-rc42

1 files changed, 17 insertions, 1 deletions

diff --git a/spec/lib/gitlab/ci/config/external/context_spec.rb b/spec/lib/gitlab/ci/config/external/context_spec.rb
index 4b9adf7e87b..800c563cd0b 100644
--- a/spec/lib/gitlab/ci/config/external/context_spec.rb
+++ b/spec/lib/gitlab/ci/config/external/context_spec.rb
@@ -6,7 +6,8 @@ RSpec.describe Gitlab::Ci::Config::External::Context do
   let(:project) { double('Project') }
   let(:user) { double('User') }
   let(:sha) { '12345' }
-  let(:attributes) { { project: project, user: user, sha: sha } }
+  let(:variables) { Gitlab::Ci::Variables::Collection.new([{ 'key' => 'a', 'value' => 'b' }]) }
+  let(:attributes) { { project: project, user: user, sha: sha, variables: variables } }
 
   subject(:subject) { described_class.new(**attributes) }
 
@@ -15,6 +16,9 @@ RSpec.describe Gitlab::Ci::Config::External::Context do
       it { is_expected.to have_attributes(**attributes) }
       it { expect(subject.expandset).to eq(Set.new) }
       it { expect(subject.execution_deadline).to eq(0) }
+      it { expect(subject.variables).to be_instance_of(Gitlab::Ci::Variables::Collection) }
+      it { expect(subject.variables_hash).to be_instance_of(ActiveSupport::HashWithIndifferentAccess) }
+      it { expect(subject.variables_hash).to include('a' => 'b') }
     end
 
     context 'without values' do
@@ -23,6 +27,8 @@ RSpec.describe Gitlab::Ci::Config::External::Context do
       it { is_expected.to have_attributes(**attributes) }
       it { expect(subject.expandset).to eq(Set.new) }
       it { expect(subject.execution_deadline).to eq(0) }
+      it { expect(subject.variables).to be_instance_of(Gitlab::Ci::Variables::Collection) }
+      it { expect(subject.variables_hash).to be_instance_of(ActiveSupport::HashWithIndifferentAccess) }
     end
   end
 
@@ -94,6 +100,15 @@ RSpec.describe Gitlab::Ci::Config::External::Context do
   end
 
   describe '#mutate' do
+    let(:attributes) do
+      {
+        project: project,
+        user: user,
+        sha: sha,
+        logger: double('logger')
+      }
+    end
+
     shared_examples 'a mutated context' do
       let(:mutated) { subject.mutate(new_attributes) }
 
@@ -107,6 +122,7 @@ RSpec.describe Gitlab::Ci::Config::External::Context do
       it { expect(mutated).to have_attributes(new_attributes) }
       it { expect(mutated.expandset).to eq(subject.expandset) }
       it { expect(mutated.execution_deadline).to eq(mutated.execution_deadline) }
+      it { expect(mutated.logger).to eq(mutated.logger) }
     end
 
     context 'with attributes' do