diff --git a/lib/gitlab/ci/config/node/configurable.rb b/lib/gitlab/ci/config/node/configurable.rb index 4889a21a2344340346f79132bb2733190d0f00b5..37936fc82421d21dd0818021c822aa48f3fcb1e2 100644 --- a/lib/gitlab/ci/config/node/configurable.rb +++ b/lib/gitlab/ci/config/node/configurable.rb @@ -26,9 +26,7 @@ module Gitlab private def create_node(key, factory) - factory.with(value: @config[key]) - factory.with(parent: self) - factory.with(key: key) + factory.with(value: @config[key], key: key, parent: self) factory.create! end diff --git a/lib/gitlab/ci/config/node/stages.rb b/lib/gitlab/ci/config/node/stages.rb index 88d88252bce2286918d0b47c28a82e8b56eb451f..b1fe45357ff266c3dfd1317aa29693338a8edb42 100644 --- a/lib/gitlab/ci/config/node/stages.rb +++ b/lib/gitlab/ci/config/node/stages.rb @@ -13,7 +13,7 @@ module Gitlab end def self.default - %w(build test deploy) + %w[build test deploy] end end end diff --git a/lib/gitlab/ci/config/node/validator.rb b/lib/gitlab/ci/config/node/validator.rb index 1ba2e1dc59de10cd897e8f16ff9d99780ba206b2..758a6cf435672d50610df01516211ad45f73d198 100644 --- a/lib/gitlab/ci/config/node/validator.rb +++ b/lib/gitlab/ci/config/node/validator.rb @@ -23,6 +23,7 @@ module Gitlab def unknown_keys return [] unless config.is_a?(Hash) + config.keys - @node.class.nodes.keys end diff --git a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb index 262a91fedff813f7e22aa6322b11dbcb9c4ac065..33b9d5f8f22e1aaf803cee7593b82903218d8e68 100644 --- a/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb +++ b/spec/lib/ci/gitlab_ci_yaml_processor_spec.rb @@ -551,8 +551,8 @@ module Ci config_processor = GitlabCiYamlProcessor.new(config, path) ## - # When variables config is empty, we asumme this is a correct, - # see issue #18775 + # When variables config is empty, we assume this is a valid + # configuration, see issue #18775 # expect(config_processor.job_variables(:rspec)) .to be_an_instance_of(Array).and be_empty diff --git a/spec/lib/gitlab/ci/config/node/boolean_spec.rb b/spec/lib/gitlab/ci/config/node/boolean_spec.rb index 32639296e6d7efb6ff2d9256639446ec7ba1f065..deafa8bf8a7b0fa5cd767edc2636058b0f7d8582 100644 --- a/spec/lib/gitlab/ci/config/node/boolean_spec.rb +++ b/spec/lib/gitlab/ci/config/node/boolean_spec.rb @@ -21,7 +21,7 @@ describe Gitlab::Ci::Config::Node::Boolean do end context 'when entry value is not valid' do - let(:config) { [ 'incorrect' ] } + let(:config) { ['incorrect'] } describe '#errors' do it 'saves errors' do diff --git a/spec/lib/gitlab/ci/config/node/configurable_spec.rb b/spec/lib/gitlab/ci/config/node/configurable_spec.rb index 4a1550517fbafe8c3ada2654d31ae3b0a16052d6..c468ecf957b8fe277e0fb71b970cf750159ebc89 100644 --- a/spec/lib/gitlab/ci/config/node/configurable_spec.rb +++ b/spec/lib/gitlab/ci/config/node/configurable_spec.rb @@ -22,7 +22,6 @@ describe Gitlab::Ci::Config::Node::Configurable do validator.validate end - context 'when node validator is invalid' do let(:instance) { node.new('ls') }