Delegate Ci config entry value to single method

3 files changed, 16 insertions, 8 deletions

diff --git a/spec/lib/gitlab/ci/config/node/before_script_spec.rb b/spec/lib/gitlab/ci/config/node/before_script_spec.rb
index 8ccefb9b9b9..bc34b9c9b56 100644
--- a/spec/lib/gitlab/ci/config/node/before_script_spec.rb
+++ b/spec/lib/gitlab/ci/config/node/before_script_spec.rb
@@ -7,9 +7,9 @@ describe Gitlab::Ci::Config::Node::BeforeScript do
   context 'when entry value is correct' do
     let(:value) { ['ls', 'pwd'] }
 
-    describe '#script' do
+    describe '#value' do
       it 'returns concatenated command' do
-        expect(entry.script).to eq "ls\npwd"
+        expect(entry.value).to eq "ls\npwd"
       end
     end
 
@@ -29,11 +29,5 @@ describe Gitlab::Ci::Config::Node::BeforeScript do
           .to include /should be an array of strings/
       end
     end
-
-    describe '#script' do
-      it 'raises error' do
-        expect { entry.script }.to raise_error
-      end
-    end
   end
 end
diff --git a/spec/lib/gitlab/ci/config/node/global_spec.rb b/spec/lib/gitlab/ci/config/node/global_spec.rb
index 7f49b89f6d6..66d40be6e6e 100644
--- a/spec/lib/gitlab/ci/config/node/global_spec.rb
+++ b/spec/lib/gitlab/ci/config/node/global_spec.rb
@@ -65,6 +65,14 @@ describe Gitlab::Ci::Config::Node::Global do
           .to include 'before_script should be an array of strings'
       end
     end
+
+    describe '#before_script' do
+      it 'raises error' do
+        expect { global.before_script }.to raise_error(
+          Gitlab::Ci::Config::Node::Entry::InvalidError
+        )
+      end
+    end
   end
 
   context 'when value is not a hash' do
diff --git a/spec/lib/gitlab/ci/config/node/null_spec.rb b/spec/lib/gitlab/ci/config/node/null_spec.rb
index 42a67892966..fa75bdcaa6f 100644
--- a/spec/lib/gitlab/ci/config/node/null_spec.rb
+++ b/spec/lib/gitlab/ci/config/node/null_spec.rb
@@ -14,4 +14,10 @@ describe Gitlab::Ci::Config::Node::Null do
       expect(entry.any_method).to be nil
     end
   end
+
+  describe '#value' do
+    it 'returns nill' do
+      expect(entry.value).to be nil
+    end
+  end
 end