Raise exception when initializing unknown policy

2 files changed, 3 insertions, 10 deletions

diff --git a/lib/gitlab/ci/build/policy.rb b/lib/gitlab/ci/build/policy.rb
index 6ab2f86c2e9..d10cc7802d4 100644
--- a/lib/gitlab/ci/build/policy.rb
+++ b/lib/gitlab/ci/build/policy.rb
@@ -4,11 +4,7 @@ module Gitlab
       module Policy
         def self.fabricate(specs)
           specifications = specs.to_h.map do |spec, value|
-            begin
-              self.const_get(spec.to_s.camelize).new(value)
-            rescue NameError
-              next
-            end
+            self.const_get(spec.to_s.camelize).new(value)
           end
 
           specifications.compact
diff --git a/spec/lib/gitlab/ci/build/policy_spec.rb b/spec/lib/gitlab/ci/build/policy_spec.rb
index c4addafcea4..20ee3dd3e89 100644
--- a/spec/lib/gitlab/ci/build/policy_spec.rb
+++ b/spec/lib/gitlab/ci/build/policy_spec.rb
@@ -20,11 +20,8 @@ describe Gitlab::Ci::Build::Policy do
 
     context 'when some policies are not defined' do
       it 'gracefully skips unknown policies' do
-        specs = described_class.fabricate(something: 'first', else: 'unknown')
-
-        expect(specs).to be_an Array
-        expect(specs).to be_one
-        expect(policy).to have_received(:new).with('first')
+        expect { described_class.fabricate(unknown: 'first') }
+          .to raise_error(NameError)
       end
     end