X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fget_module_path_spec.rb;h=dd31c67831c0d49e3a9901fb69e974f273818090;hb=d53c789b368b6d3dbc41671fd7a1f16050172627;hp=a39e413d50af4b6a0e9cd0b71fd0a899d8ffa3fd;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/get_module_path_spec.rb b/3rdparty/modules/stdlib/spec/functions/get_module_path_spec.rb
old mode 100755
new mode 100644
index a39e413d5..dd31c6783
--- a/3rdparty/modules/stdlib/spec/functions/get_module_path_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/get_module_path_spec.rb
@@ -2,11 +2,12 @@ require 'spec_helper'
 
 describe 'get_module_path' do
   it { is_expected.not_to eq(nil) }
-  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/) }
-  it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, /Could not find module/) }
+  it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Wrong number of arguments, expects one}) }
+  it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, %r{Wrong number of arguments, expects one}) }
+  it { is_expected.to run.with_params('one', 'two', 'three').and_raise_error(Puppet::ParseError, %r{Wrong number of arguments, expects one}) }
+  it { is_expected.to run.with_params('one').and_raise_error(Puppet::ParseError, %r{Could not find module}) }
 
+  # class Stubmodule
   class StubModule
     attr_reader :path
     def initialize(path)
@@ -15,33 +16,41 @@ describe 'get_module_path' do
   end
 
   describe 'when locating a module' do
-    let(:modulepath) { "/tmp/does_not_exist" }
-    let(:path_of_module_foo) { StubModule.new("/tmp/does_not_exist/foo") }
+    let(:modulepath) { '/tmp/does_not_exist' }
+    let(:path_of_module_foo) { StubModule.new('/tmp/does_not_exist/foo') }
 
-    before(:each) { Puppet[:modulepath] = modulepath }
-
-    context 'in the default environment' do
-      before(:each) { Puppet::Module.expects(:find).with('foo', 'rp_env').returns(path_of_module_foo) }
+    before(:each) do
+      Puppet[:modulepath] = modulepath
+    end
 
-      it { is_expected.to run.with_params('foo').and_return(path_of_module_foo.path) }
+    context 'when in the default environment' do
+      before(:each) do
+        allow(Puppet::Module).to receive(:find).with('foo', 'rp_env').and_return(path_of_module_foo)
+      end
+      it 'runs against foo' do
+        is_expected.to run.with_params('foo').and_return(path_of_module_foo.path)
+      end
 
-      context 'when the modulepath is a list' do
-        before(:each) { Puppet[:modulepath] = modulepath + 'tmp/something_else' }
+      it 'when the modulepath is a list' do
+        Puppet[:modulepath] = modulepath + 'tmp/something_else'
 
-        it { is_expected.to run.with_params('foo').and_return(path_of_module_foo.path) }
+        is_expected.to run.with_params('foo').and_return(path_of_module_foo.path)
       end
     end
 
-    context 'in a non-default default environment' do
+    context 'when in a non-default default environment' do
       let(:environment) { 'test' }
-      before(:each) { Puppet::Module.expects(:find).with('foo', 'test').returns(path_of_module_foo) }
 
-      it { is_expected.to run.with_params('foo').and_return(path_of_module_foo.path) }
-
-      context 'when the modulepath is a list' do
-        before(:each) { Puppet[:modulepath] = modulepath + 'tmp/something_else' }
+      before(:each) do
+        allow(Puppet::Module).to receive(:find).with('foo', 'test').and_return(path_of_module_foo)
+      end
+      it 'runs against foo' do
+        is_expected.to run.with_params('foo').and_return(path_of_module_foo.path)
+      end
 
-        it { is_expected.to run.with_params('foo').and_return(path_of_module_foo.path) }
+      it 'when the modulepath is a list' do
+        Puppet[:modulepath] = modulepath + 'tmp/something_else'
+        is_expected.to run.with_params('foo').and_return(path_of_module_foo.path)
       end
     end
   end