Improve reporting of a CI/CD entry config location

lib/gitlab/ci/config/entry/attributable.rb

@@ -8,6 +8,8 @@ module Gitlab
           class_methods do
             def attributes(*attributes)
               attributes.flatten.each do |attribute|
+                raise ArgumentError if method_defined?(attribute)
+
                 define_method(attribute) do
                   return unless config.is_a?(Hash)
 

lib/gitlab/ci/config/entry/node.rb

@@ -71,6 +71,13 @@ module Gitlab
             true
           end
 
+          def location
+            name = @key.presence || self.class.name.to_s.demodulize
+                                        .underscore.humanize.downcase
+
+            ancestors.map(&:key).append(name).compact.join(':')
+          end
+
           def inspect
             val = leaf? ? config : descendants
             unspecified = specified? ? '' : '(unspecified) '

lib/gitlab/ci/config/entry/policy.rb

@@ -37,7 +37,7 @@ module Gitlab
 
           class UnknownStrategy < Entry::Node
             def errors
-              ['policy has to be either an array of conditions or a hash']
+              ["#{location} has to be either an array of conditions or a hash"]
             end
           end
 

lib/gitlab/ci/config/entry/validator.rb

@@ -8,7 +8,6 @@ module Gitlab
 
           def initialize(entry)
             super(entry)
-            @entry = entry
           end
 
           def messages
@@ -20,16 +19,6 @@ module Gitlab
           def self.name
             'Validator'
           end
-
-          private
-
-          def location
-            ancestors.map(&:key).compact.append(key_name).join(':')
-          end
-
-          def key_name
-            key.presence || @entry.class.name.to_s.demodulize.underscore.humanize
-          end
         end
       end
     end

spec/lib/ci/gitlab_ci_yaml_processor_spec.rb

@@ -344,28 +344,32 @@ module Ci
           let(:config) { { rspec: { script: "rspec", type: "test", only: only } } }
           let(:processor) { GitlabCiYamlProcessor.new(YAML.dump(config)) }
 
-          shared_examples 'raises an error' do
-            it do
-              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError, 'jobs:rspec:only config should be an array of strings or regexps')
-            end
-          end
 
           context 'when it is integer' do
             let(:only) { 1 }
 
-            it_behaves_like 'raises an error'
+            it do
+              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                                  'jobs:rspec:only has to be either an array of conditions or a hash')
+            end
           end
 
           context 'when it is an array of integers' do
             let(:only) { [1, 1] }
 
-            it_behaves_like 'raises an error'
+            it do
+              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                                  'jobs:rspec:only config should be an array of strings or regexps')
+            end
           end
 
           context 'when it is invalid regex' do
             let(:only) { ["/*invalid/"] }
 
-            it_behaves_like 'raises an error'
+            it do
+              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                                  'jobs:rspec:only config should be an array of strings or regexps')
+            end
           end
         end
       end
@@ -518,28 +522,31 @@ module Ci
           let(:config) { { rspec: { script: "rspec", except: except } } }
           let(:processor) { GitlabCiYamlProcessor.new(YAML.dump(config)) }
 
-          shared_examples 'raises an error' do
-            it do
-              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError, 'jobs:rspec:except config should be an array of strings or regexps')
-            end
-          end
-
           context 'when it is integer' do
             let(:except) { 1 }
 
-            it_behaves_like 'raises an error'
+            it do
+              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                                  'jobs:rspec:except has to be either an array of conditions or a hash')
+            end
           end
 
           context 'when it is an array of integers' do
             let(:except) { [1, 1] }
 
-            it_behaves_like 'raises an error'
+            it do
+              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                                  'jobs:rspec:except config should be an array of strings or regexps')
+            end
           end
 
           context 'when it is invalid regex' do
             let(:except) { ["/*invalid/"] }
 
-            it_behaves_like 'raises an error'
+            it do
+              expect { processor }.to raise_error(GitlabCiYamlProcessor::ValidationError,
+                                                  'jobs:rspec:except config should be an array of strings or regexps')
+            end
           end
         end
       end

spec/lib/gitlab/ci/config/entry/policy_spec.rb

@@ -81,7 +81,7 @@ describe Gitlab::Ci::Config::Entry::Policy do
 
     it 'returns information about errors' do
       expect(entry.errors)
-        .to include 'policy has to be either an array of conditions or a hash'
+        .to include /has to be either an array of conditions or a hash/
     end
   end
 

spec/lib/gitlab/ci/config/entry/validator_spec.rb

@@ -48,7 +48,7 @@ describe Gitlab::Ci::Config::Entry::Validator do
         validator_instance.validate
 
         expect(validator_instance.messages)
-          .to include "node test attribute can't be blank"
+          .to include /test attribute can't be blank/
       end
     end
   end