From f1edd2715a755573d7578839a3efe8473b79b5c5 Mon Sep 17 00:00:00 2001
From: David Schmitt <david.schmitt@puppet.com>
Date: Tue, 6 Sep 2016 11:18:48 +0100
Subject: (MODULES-3737) validate_legacy: refactoring

* validate_legacy now accepts undef values
* update the TypeMismatch message to include the original validate function name
* only notice, not warn, on newly allowed values
* changed previous_validation to function_name to avoid confusion with the function of the same name
* use deprecation() instead of warn(), when hitting a deprecated value
* prepare the tests and function for MODULES-3735
* rewrite validate_legacy tests to use new rspec-puppet
* move validate_re deprecation to puppet4 only
* adapt validate_re_spec
---
 spec/classes/validate_legacy_spec.rb | 39 ------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 spec/classes/validate_legacy_spec.rb

(limited to 'spec/classes')

diff --git a/spec/classes/validate_legacy_spec.rb b/spec/classes/validate_legacy_spec.rb
deleted file mode 100644
index ded6890..0000000
--- a/spec/classes/validate_legacy_spec.rb
+++ /dev/null
@@ -1,39 +0,0 @@
-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_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_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_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_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: 100, previous_arg2: 0 }}
-      it { is_expected.to compile }
-    end
-  end
-end
-- 
cgit v1.2.3