Merge branch 'aw-refactor-input-matches' into 'master'

Move self.matches to BaseInput

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/137144



Merged-by: Fabio Pitino <fpitino@gitlab.com>
Approved-by: Fabio Pitino <fpitino@gitlab.com>
Reviewed-by: Fabio Pitino <fpitino@gitlab.com>
Co-authored-by: Avielle Wolfe <awolfe@gitlab.com>

lib/gitlab/ci/config/interpolation/inputs/base_input.rb

@@ -10,9 +10,8 @@ class Inputs
           class BaseInput
             ArgumentNotValidError = Class.new(StandardError)
 
-            # Checks whether the class matches the type in the specification
             def self.matches?(spec)
-              raise NotImplementedError
+              spec.is_a?(Hash) && spec[:type] == type_name
             end
 
             # Human readable type used in error messages

lib/gitlab/ci/config/interpolation/inputs/boolean_input.rb

@@ -8,10 +8,6 @@ class Inputs
           class BooleanInput < BaseInput
             extend ::Gitlab::Utils::Override
 
-            def self.matches?(spec)
-              spec.is_a?(Hash) && spec[:type] == type_name
-            end
-
             def self.type_name
               'boolean'
             end

lib/gitlab/ci/config/interpolation/inputs/number_input.rb

@@ -8,10 +8,6 @@ class Inputs
           class NumberInput < BaseInput
             extend ::Gitlab::Utils::Override
 
-            def self.matches?(spec)
-              spec.is_a?(Hash) && spec[:type] == type_name
-            end
-
             def self.type_name
               'number'
             end

lib/gitlab/ci/config/interpolation/inputs/string_input.rb

@@ -17,7 +17,7 @@ def self.matches?(spec)
               #   inputs:
               #     foo:
               # ```
-              spec.nil? || (spec.is_a?(Hash) && [nil, type_name].include?(spec[:type]))
+              spec.nil? || super || (spec.is_a?(Hash) && !spec.key?(:type))
             end
 
             def self.type_name

spec/lib/gitlab/ci/config/interpolation/inputs/base_input_spec.rb

@@ -4,8 +4,34 @@
 
 RSpec.describe Gitlab::Ci::Config::Interpolation::Inputs::BaseInput, feature_category: :pipeline_composition do
   describe '.matches?' do
-    it 'is not implemented' do
-      expect { described_class.matches?(double) }.to raise_error(NotImplementedError)
+    context 'when given is a hash' do
+      before do
+        stub_const('TestInput', Class.new(described_class))
+
+        TestInput.class_eval do
+          def self.type_name
+            'test'
+          end
+        end
+      end
+
+      context 'when the spec type matches the input type' do
+        it 'returns true' do
+          expect(TestInput.matches?({ type: 'test' })).to be_truthy
+        end
+      end
+
+      context 'when the spec type does not match the input type' do
+        it 'returns false' do
+          expect(TestInput.matches?({ type: 'string' })).to be_falsey
+        end
+      end
+    end
+
+    context 'when not given a hash' do
+      it 'returns false' do
+        expect(described_class.matches?([])).to be_falsey
+      end
     end
   end