summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHunter Haugen <hunter@puppet.com>2017-04-26 09:18:43 -0700
committerHunter Haugen <hunter@puppet.com>2017-04-26 09:18:43 -0700
commitccabfd3e1f4617a583546efaa4303bc24e53b89c (patch)
tree582f1cc155b78c629fc9816ddc5b8e60c2b49b04
parent047fe6da7403cdc6f480a905c0485795e51eec06 (diff)
(PE-20308) Correct boundary for 4.5 vs 4.6
-rw-r--r--lib/puppet/parser/functions/defined_with_params.rb2
-rwxr-xr-xspec/functions/defined_with_params_spec.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/puppet/parser/functions/defined_with_params.rb b/lib/puppet/parser/functions/defined_with_params.rb
index f2c6230..7f1fe93 100644
--- a/lib/puppet/parser/functions/defined_with_params.rb
+++ b/lib/puppet/parser/functions/defined_with_params.rb
@@ -25,7 +25,7 @@ ENDOFDOC
end
ret = false
- if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
+ if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0
# Workaround for PE-20308
if reference.is_a?(String)
type_name, title = Puppet::Resource.type_and_title(reference, nil)
diff --git a/spec/functions/defined_with_params_spec.rb b/spec/functions/defined_with_params_spec.rb
index 979e25a..7118d85 100755
--- a/spec/functions/defined_with_params_spec.rb
+++ b/spec/functions/defined_with_params_spec.rb
@@ -45,7 +45,7 @@ describe 'defined_with_params' do
context 'reference' do
it { is_expected.to run.with_params(Puppet::Resource.new('User[dan]'), {}).and_return(true) }
end
- if Puppet::Util::Package.versioncmp(Puppet.version, '4.5.0') >= 0
+ if Puppet::Util::Package.versioncmp(Puppet.version, '4.6.0') >= 0
context 'array' do
it 'fails' do
expect {