cleanups and missing testcase

Author: DavidS

spec/classes/validate_legacy_spec.rb

@@ -1,29 +1,37 @@
 require 'spec_helper'
 
 if Puppet.version.to_f >= 4.0
+  # validate_legacy requires a proper scope to run, so we have to trigger a true compilation here,
+  # instead of being able to leverage the function test group.
   describe 'test::validate_legacy', type: :class do
-    
+
     describe 'validate_legacy passes assertion of type but not previous validation' do
-      let(:params) {{ type: "Optional[Integer]", prev_validation: "validate_re", value: 5, previous_args1: ["^\\d+$", ""] }}
+      let(:params) {{ type: "Optional[Integer]", prev_validation: "validate_re", value: 5, previous_arg1: ["^\\d+$", ""] }}
       it { Puppet.expects(:warn).with(includes('Accepting previously invalid value for target_type'))
       is_expected.to compile }
     end
 
     describe 'validate_legacy passes assertion of type and previous validation' do
-      let(:params) {{ type: "Optional[String]", prev_validation: "validate_re", value: "5", previous_args1: ["."] }}
+      let(:params) {{ type: "Optional[String]", prev_validation: "validate_re", value: "5", previous_arg1: ["."] }}
       it { is_expected.to compile }
     end
 
     describe 'validate_legacy fails assertion of type and passes previous validation' do
-      let(:params) {{ type: "Optional[Integer]", prev_validation: "validate_re", value: "5", previous_args1: ["."] }}
-      it { Puppet.expects(:warn).with(includes('expected'))
-      is_expected.to compile }
+      let(:params) {{ type: "Optional[Integer]", prev_validation: "validate_re", value: "5", previous_arg1: ["."] }}
+      it {
+        Puppet.expects(:warn).with(includes('expected'))
+        is_expected.to compile
+      }
     end
 
     describe 'validate_legacy fails assertion and fails previous validation' do
-      let(:params) {{ type: "Optional[Integer]", prev_validation: "validate_re", value: "5", previous_args1: ["thisisnotright"] }}      
+      let(:params) {{ type: "Optional[Integer]", prev_validation: "validate_re", value: "5", previous_arg1: ["thisisnotright"] }}
       it { is_expected.to compile.and_raise_error(/Error while evaluating a Function Call, \w* expected an \w* value, got \w*/) }
     end
 
+    describe 'validate_legacy works with multi-argument validate_ functions' do
+      let(:params) {{ type: "Integer", prev_validation: "validate_integer", value: 10, previous_arg1: 0, previous_arg2: 100 }}
+      it { is_expected.to compile }
+    end
   end
 end

spec/fixtures/test/manifests/validate_legacy.pp

@@ -1,9 +1,18 @@
 # Class to test stdlib validate_legacy function
 
-class test::validate_legacy( $type, $prev_validation, $value, $previous_args1
-    ) {
+class test::validate_legacy(
+  $type,
+  $prev_validation,
+  $value,
+  $previous_arg1,
+  $previous_arg2 = undef,
+  ) {
 
-  validate_legacy( $type, $prev_validation, $value, $previous_args1 )
+  if $previous_arg2 == undef {
+    validate_legacy( $type, $prev_validation, $value, $previous_arg1 )
+  } else {
+    validate_legacy( $type, $prev_validation, $value, $previous_arg1, $previous_arg2 )
+  }
   notice("Success")
 
 }