diff options
| author | David Schmitt <david.schmitt@puppet.com> | 2016-08-14 13:50:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-14 13:50:22 +0100 |
| commit | 1d9d2c02d6669d4a6219140ae7ff3648a30c89cf (patch) | |
| tree | 709bcf434658a291ce9a87e3bc4639992141725b /spec | |
| parent | f9c74fb04ecb9daccfa8b35b854ffd0601187a16 (diff) | |
| parent | adf922c28441bc95f5cbac1f0951256c080b3298 (diff) | |
Merge pull request #630 from HelenCampbell/validateLegacy
(MODULES-3540) Addition of validate legacy function
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/classes/validate_legacy_spec.rb | 39 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/absolute_path.pp (renamed from spec/fixtures/modules/test/manifests/absolute_path.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/array.pp (renamed from spec/fixtures/modules/test/manifests/array.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/bool.pp (renamed from spec/fixtures/modules/test/manifests/bool.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/float.pp (renamed from spec/fixtures/modules/test/manifests/float.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/integer.pp (renamed from spec/fixtures/modules/test/manifests/integer.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/numeric.pp (renamed from spec/fixtures/modules/test/manifests/numeric.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/string.pp (renamed from spec/fixtures/modules/test/manifests/string.pp) | 0 | ||||
| -rw-r--r-- | spec/fixtures/test/manifests/validate_legacy.pp | 18 |
9 files changed, 57 insertions, 0 deletions
diff --git a/spec/classes/validate_legacy_spec.rb b/spec/classes/validate_legacy_spec.rb new file mode 100644 index 0000000..ded6890 --- /dev/null +++ b/spec/classes/validate_legacy_spec.rb @@ -0,0 +1,39 @@ +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 diff --git a/spec/fixtures/modules/test/manifests/absolute_path.pp b/spec/fixtures/test/manifests/absolute_path.pp index d77f6bd..d77f6bd 100644 --- a/spec/fixtures/modules/test/manifests/absolute_path.pp +++ b/spec/fixtures/test/manifests/absolute_path.pp diff --git a/spec/fixtures/modules/test/manifests/array.pp b/spec/fixtures/test/manifests/array.pp index 84b6a5b..84b6a5b 100644 --- a/spec/fixtures/modules/test/manifests/array.pp +++ b/spec/fixtures/test/manifests/array.pp diff --git a/spec/fixtures/modules/test/manifests/bool.pp b/spec/fixtures/test/manifests/bool.pp index ab5b5ea..ab5b5ea 100644 --- a/spec/fixtures/modules/test/manifests/bool.pp +++ b/spec/fixtures/test/manifests/bool.pp diff --git a/spec/fixtures/modules/test/manifests/float.pp b/spec/fixtures/test/manifests/float.pp index 03a603d..03a603d 100644 --- a/spec/fixtures/modules/test/manifests/float.pp +++ b/spec/fixtures/test/manifests/float.pp diff --git a/spec/fixtures/modules/test/manifests/integer.pp b/spec/fixtures/test/manifests/integer.pp index a4f26df..a4f26df 100644 --- a/spec/fixtures/modules/test/manifests/integer.pp +++ b/spec/fixtures/test/manifests/integer.pp diff --git a/spec/fixtures/modules/test/manifests/numeric.pp b/spec/fixtures/test/manifests/numeric.pp index 2657ebc..2657ebc 100644 --- a/spec/fixtures/modules/test/manifests/numeric.pp +++ b/spec/fixtures/test/manifests/numeric.pp diff --git a/spec/fixtures/modules/test/manifests/string.pp b/spec/fixtures/test/manifests/string.pp index 6508c70..6508c70 100644 --- a/spec/fixtures/modules/test/manifests/string.pp +++ b/spec/fixtures/test/manifests/string.pp diff --git a/spec/fixtures/test/manifests/validate_legacy.pp b/spec/fixtures/test/manifests/validate_legacy.pp new file mode 100644 index 0000000..706df88 --- /dev/null +++ b/spec/fixtures/test/manifests/validate_legacy.pp @@ -0,0 +1,18 @@ +# Class to test stdlib validate_legacy function + +class test::validate_legacy( + $type, + $prev_validation, + $value, + $previous_arg1, + $previous_arg2 = undef, + ) { + + 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") + +} |