summaryrefslogtreecommitdiff
path: root/spec/functions
diff options
context:
space:
mode:
authorTP Honey <tphoney@users.noreply.github.com>2016-04-07 16:01:25 +0100
committerTP Honey <tphoney@users.noreply.github.com>2016-04-07 16:01:25 +0100
commit0624c3f8060deb6469046d13008a8fc605a72faa (patch)
tree0ded46e239e54520d889d51555ebb238c6dbfbfc /spec/functions
parentc5486aba6284664ae87a65beaa011211c70ea03e (diff)
parent5639828bffd1beb0e44e59554e17c1a891924145 (diff)
Merge pull request #589 from puppetlabs/modulesync-update
Multiple updates to stdlib and its testsuite
Diffstat (limited to 'spec/functions')
-rwxr-xr-xspec/functions/get_module_path_spec.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/spec/functions/get_module_path_spec.rb b/spec/functions/get_module_path_spec.rb
index b1f682f..a39e413 100755
--- a/spec/functions/get_module_path_spec.rb
+++ b/spec/functions/get_module_path_spec.rb
@@ -5,11 +5,7 @@ describe 'get_module_path' do
it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) }
it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) }
it { is_expected.to run.with_params('one', 'two', 'three').and_raise_error(Puppet::ParseError, /Wrong number of arguments, expects one/) }
- if Puppet.version.to_f >= 4.0
- it { is_expected.to run.with_params('one').and_raise_error(Puppet::Environments::EnvironmentNotFound, /Could not find a directory environment/) }
- else
- it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, /Could not find module/) }
- end
+ it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, /Could not find module/) }
class StubModule
attr_reader :path