Introduce default: for gitlab-ci.yml

This moves all existing `image/services/before_script/variables`
into `default:`. This allows us to easily add a default and
top-level entries. `default`: is keep backward compatible: to
be considered to be job if `default:script:` is specified. This
behavior should be removed.

All existing `image/services/before_script/variables` are properly
handled in root context.

2 files changed, 45 insertions, 7 deletions

diff --git a/spec/lib/gitlab/config/entry/configurable_spec.rb b/spec/lib/gitlab/config/entry/configurable_spec.rb
index 37e38e49c0d..62dbf20ddf8 100644
--- a/spec/lib/gitlab/config/entry/configurable_spec.rb
+++ b/spec/lib/gitlab/config/entry/configurable_spec.rb
@@ -34,18 +34,25 @@ describe Gitlab::Config::Entry::Configurable do
 
     before do
       entry.class_exec(entry_class) do |entry_class|
-        entry :object, entry_class, description: 'test object'
+        entry :object, entry_class,
+          description: 'test object',
+          inherit: true,
+          reserved: true
       end
     end
 
     describe '.nodes' do
       it 'has valid nodes' do
-        expect(entry.nodes).to include :object
+        expect(entry.nodes).to include(:object)
       end
 
       it 'creates a node factory' do
-        expect(entry.nodes[:object])
-          .to be_an_instance_of Gitlab::Config::Entry::Factory
+        factory = entry.nodes[:object]
+
+        expect(factory).to be_an_instance_of(Gitlab::Config::Entry::Factory)
+        expect(factory.description).to eq('test object')
+        expect(factory.inheritable?).to eq(true)
+        expect(factory.reserved?).to eq(true)
       end
 
       it 'returns a duplicated factory object' do
@@ -55,5 +62,17 @@ describe Gitlab::Config::Entry::Configurable do
         expect(first_factory).not_to be_equal(second_factory)
       end
     end
+
+    describe '.reserved_node_names' do
+      before do
+        entry.class_exec(entry_class) do |entry_class|
+          entry :not_reserved, entry_class
+        end
+      end
+
+      it 'returns all nodes with reserved: true' do
+        expect(entry.reserved_node_names).to contain_exactly(:object)
+      end
+    end
   end
 end
diff --git a/spec/lib/gitlab/config/entry/factory_spec.rb b/spec/lib/gitlab/config/entry/factory_spec.rb
index c29d17eaee3..42f8be8e141 100644
--- a/spec/lib/gitlab/config/entry/factory_spec.rb
+++ b/spec/lib/gitlab/config/entry/factory_spec.rb
@@ -23,17 +23,36 @@ describe Gitlab::Config::Entry::Factory do
       end
 
       context 'when setting description' do
-        it 'creates entry with description' do
-          entry = factory
+        before do
+          factory
             .value(%w(ls pwd))
             .with(description: 'test description')
-            .create!
+        end
+
+        it 'configures description' do
+          expect(factory.description).to eq 'test description'
+        end
+
+        it 'creates entry with description' do
+          entry = factory.create!
 
           expect(entry.value).to eq %w(ls pwd)
           expect(entry.description).to eq 'test description'
         end
       end
 
+      context 'when setting inherit' do
+        before do
+          factory
+            .value(%w(ls pwd))
+            .with(inherit: true)
+        end
+
+        it 'makes object inheritable' do
+          expect(factory.inheritable?).to eq true
+        end
+      end
+
       context 'when setting key' do
         it 'creates entry with custom key' do
           entry = factory