diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-05 16:16:34 -0400 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-05 16:16:34 -0400 |
commit | ffe21fc67491c4502114505c82142781d72720ab (patch) | |
tree | 7f0ee09079863a19f07e0bb999e387eedb32e17e /spec/functions/get_module_path_spec.rb | |
parent | f9f6e92dffa8364cfbbd92a6a65f4be4ef176d2c (diff) | |
parent | 6287a200af558d277f83b919e8409f6c798eef39 (diff) | |
download | puppet-stdlib-ffe21fc67491c4502114505c82142781d72720ab.tar.gz puppet-stdlib-ffe21fc67491c4502114505c82142781d72720ab.tar.bz2 |
Merge pull request #268 from apenney/rspec3
Rspec3 changes
Diffstat (limited to 'spec/functions/get_module_path_spec.rb')
-rwxr-xr-x | spec/functions/get_module_path_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/functions/get_module_path_spec.rb b/spec/functions/get_module_path_spec.rb index 486bef6..38ce645 100755 --- a/spec/functions/get_module_path_spec.rb +++ b/spec/functions/get_module_path_spec.rb @@ -29,18 +29,18 @@ describe Puppet::Parser::Functions.function(:get_module_path) do it 'should be able to find module paths from the modulepath setting' do Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo) - scope.function_get_module_path(['foo']).should == path_of_module_foo.path + expect(scope.function_get_module_path(['foo'])).to eq(path_of_module_foo.path) end it 'should be able to find module paths when the modulepath is a list' do Puppet[:modulepath] = modulepath + ":/tmp" Puppet::Module.expects(:find).with('foo', 'production').returns(path_of_module_foo) - scope.function_get_module_path(['foo']).should == path_of_module_foo.path + expect(scope.function_get_module_path(['foo'])).to eq(path_of_module_foo.path) end it 'should respect the environment' do - pending("Disabled on Puppet 2.6.x") if Puppet.version =~ /^2\.6\b/ + skip("Disabled on Puppet 2.6.x") if Puppet.version =~ /^2\.6\b/ Puppet.settings[:environment] = 'danstestenv' Puppet::Module.expects(:find).with('foo', 'danstestenv').returns(path_of_module_foo) - scope('danstestenv').function_get_module_path(['foo']).should == path_of_module_foo.path + expect(scope('danstestenv').function_get_module_path(['foo'])).to eq(path_of_module_foo.path) end end end |