Improve variable comparison

2 files changed, 4 insertions, 4 deletions

diff --git a/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb b/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb
index 17f15ac3b27..85d73e5c382 100644
--- a/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb
+++ b/spec/lib/gitlab/ci/pipeline/chain/build_spec.rb
@@ -44,7 +44,8 @@ describe Gitlab::Ci::Pipeline::Chain::Build do
     expect(pipeline.tag).to be false
     expect(pipeline.user).to eq user
     expect(pipeline.project).to eq project
-    expect(pipeline.variables.size).to eq variables_attributes.count
+    expect(pipeline.variables.map { |var| var.slice(:key, :secret_value) })
+      .to eq variables_attributes.map(&:with_indifferent_access)
   end
 
   it 'sets a valid config source' do
diff --git a/spec/services/ci/create_pipeline_service_spec.rb b/spec/services/ci/create_pipeline_service_spec.rb
index 24717898c33..9a0b6efd8a9 100644
--- a/spec/services/ci/create_pipeline_service_spec.rb
+++ b/spec/services/ci/create_pipeline_service_spec.rb
@@ -557,9 +557,8 @@ describe Ci::CreatePipelineService do
       subject { execute_service(variables_attributes: variables_attributes) }
 
       it 'creates a pipeline with specified variables' do
-        expect(subject.variables.count).to eq(variables_attributes.count)
-        expect(subject.variables.first.key).to eq(variables_attributes.first[:key])
-        expect(subject.variables.last.secret_value).to eq(variables_attributes.last[:secret_value])
+        expect(subject.variables.map { |var| var.slice(:key, :secret_value) })
+          .to eq variables_attributes.map(&:with_indifferent_access)
       end
     end
   end