Improve specs for predefined build variables

2 files changed, 22 insertions, 10 deletions

diff --git a/spec/lib/gitlab/ci/build/policy/variables_spec.rb b/spec/lib/gitlab/ci/build/policy/variables_spec.rb
index a66a9144a16..fd259560a6d 100644
--- a/spec/lib/gitlab/ci/build/policy/variables_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy/variables_spec.rb
@@ -49,11 +49,9 @@ describe Gitlab::Ci::Build::Policy::Variables do
     end
 
     it 'allows to evaluate regular secret variables' do
-      secret = create(:ci_variable, project: project,
-                                    key: 'SECRET',
-                                    value: 'secret value')
+      create(:ci_variable, project: project, key: 'SECRET', value: 'my secret')
 
-      policy = described_class.new(["$SECRET == 'secret value'"])
+      policy = described_class.new(["$SECRET == 'my secret'"])
 
       expect(policy).to be_satisfied_by(pipeline, seed)
     end
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 0f62ff4ccae..48eeca53f46 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -2054,14 +2054,28 @@ describe Ci::Build do
   end
 
   describe '#variables_hash' do
-    before do
-      project.variables.create!(key: 'MY_VAR', value: 'my value 1')
-      pipeline.variables.create!(key: 'MY_VAR', value: 'my value 2')
+    context 'when overriding secret variables' do
+      before do
+        project.variables.create!(key: 'MY_VAR', value: 'my value 1')
+        pipeline.variables.create!(key: 'MY_VAR', value: 'my value 2')
+      end
+
+      it 'returns a regular hash created using valid ordering' do
+        expect(build.variables_hash).to include('MY_VAR': 'my value 2')
+        expect(build.variables_hash).not_to include('MY_VAR': 'my value 1')
+      end
     end
 
-    it 'returns a regular hash created in valid order' do
-      expect(build.variables_hash).to include('MY_VAR': 'my value 2')
-      expect(build.variables_hash).not_to include('MY_VAR': 'my value 1')
+    context 'when overriding user-provided variables' do
+      before do
+        pipeline.variables.build(key: 'MY_VAR', value: 'pipeline value')
+        build.yaml_variables = [{ key: 'MY_VAR', value: 'myvar', public: true }]
+      end
+
+      it 'returns a hash including variable with higher precedence' do
+        expect(build.variables_hash).to include('MY_VAR': 'pipeline value')
+        expect(build.variables_hash).not_to include('MY_VAR': 'myvar')
+      end
     end
   end