Make method that composes ci config entry private

4 files changed, 8 insertions, 17 deletions

diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb
index 86cc33e11be..7587c8c34c9 100644
--- a/lib/gitlab/ci/config/node/configurable.rb
+++ b/lib/gitlab/ci/config/node/configurable.rb
@@ -38,7 +38,7 @@ module Gitlab
 
           class_methods do
             def allowed_nodes
-              Hash[@allowed_nodes.map { |key, factory| [key, factory.dup] } ]
+              Hash[@allowed_nodes.map { |key, factory| [key, factory.dup] }]
             end
 
             private
diff --git a/lib/gitlab/ci/config/node/entry.rb b/lib/gitlab/ci/config/node/entry.rb
index e5692e72947..507312e0c09 100644
--- a/lib/gitlab/ci/config/node/entry.rb
+++ b/lib/gitlab/ci/config/node/entry.rb
@@ -26,12 +26,6 @@ module Gitlab
             nodes.each(&:validate!)
           end
 
-          def compose!
-            allowed_nodes.each do |key, essence|
-              @nodes[key] = create_node(key, essence)
-            end
-          end
-
           def nodes
             @nodes.values
           end
@@ -62,6 +56,12 @@ module Gitlab
 
           private
 
+          def compose!
+            allowed_nodes.each do |key, essence|
+              @nodes[key] = create_node(key, essence)
+            end
+          end
+
           def create_node(key, essence)
             raise NotImplementedError
           end
diff --git a/spec/lib/gitlab/ci/config/node/global_spec.rb b/spec/lib/gitlab/ci/config/node/global_spec.rb
index 2227fcec638..b1972172435 100644
--- a/spec/lib/gitlab/ci/config/node/global_spec.rb
+++ b/spec/lib/gitlab/ci/config/node/global_spec.rb
@@ -18,15 +18,6 @@ describe Gitlab::Ci::Config::Node::Global do
       { before_script: ['ls', 'pwd'] }
     end
 
-    describe '#compose!' do
-      before { global.compose! }
-
-      it 'instantiates entry nodes' do
-        expect(global.nodes.first)
-          .to be_an_instance_of Gitlab::Ci::Config::Node::Script
-      end
-    end
-
     describe '#process!' do
       before { global.process! }
 
diff --git a/spec/lib/gitlab/ci/config/node/null_spec.rb b/spec/lib/gitlab/ci/config/node/null_spec.rb
index fb6c3b5cbc0..36101c62462 100644
--- a/spec/lib/gitlab/ci/config/node/null_spec.rb
+++ b/spec/lib/gitlab/ci/config/node/null_spec.rb
@@ -16,7 +16,7 @@ describe Gitlab::Ci::Config::Node::Null do
   end
 
   describe '#value' do
-    it 'returns nill' do
+    it 'returns nil' do
       expect(entry.value).to be nil
     end
   end