X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fassert_private_spec.rb;h=ee7db0b23684bb1683fa45e22d470d4c1170caa9;hb=131e09855e065be940e104d9ab0f18940cc76257;hp=355e0dd3a17051b5a4ede5cda444021a835588bd;hpb=407d322498f4fde815abf381007fbecfe5c10b2b;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/assert_private_spec.rb b/3rdparty/modules/stdlib/spec/functions/assert_private_spec.rb
old mode 100755
new mode 100644
index 355e0dd3a..ee7db0b23
--- a/3rdparty/modules/stdlib/spec/functions/assert_private_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/assert_private_spec.rb
@@ -2,40 +2,37 @@ require 'spec_helper'
 
 describe 'assert_private' do
   context 'when called from inside module' do
-    it "should not fail" do
-      scope.expects(:lookupvar).with('module_name').returns('foo')
-      scope.expects(:lookupvar).with('caller_module_name').returns('foo')
+    it 'does not fail' do
+      expect(scope).to receive(:lookupvar).with('module_name').and_return('foo')
+      expect(scope).to receive(:lookupvar).with('caller_module_name').and_return('foo')
 
-      is_expected.to run.with_params()
+      is_expected.to run.with_params
     end
   end
 
-  context "when called from private class" do
-    before :each do
-      scope.expects(:lookupvar).with('module_name').returns('foo')
-      scope.expects(:lookupvar).with('caller_module_name').returns('bar')
-    end
-
-    it "should fail with a class error message" do
-      scope.source.expects(:name).returns('foo::baz')
-      scope.source.expects(:type).returns('hostclass')
+  context 'when called from private class' do
+    it 'fails with a class error message' do
+      expect(scope).to receive(:lookupvar).with('module_name').and_return('foo')
+      expect(scope).to receive(:lookupvar).with('caller_module_name').and_return('bar')
+      expect(scope.source).to receive(:name).and_return('foo::baz')
+      expect(scope.source).to receive(:type).and_return('hostclass')
 
-      is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /Class foo::baz is private/)
+      is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Class foo::baz is private})
     end
 
-    context "with an explicit failure message" do
-      it { is_expected.to run.with_params('failure message!').and_raise_error(Puppet::ParseError, /failure message!/) }
+    it 'fails with an explicit failure message' do
+      is_expected.to run.with_params('failure message!').and_raise_error(Puppet::ParseError, %r{failure message!})
     end
   end
 
-  context "when called from private definition" do
-    it "should fail with a class error message" do
-      scope.expects(:lookupvar).with('module_name').returns('foo')
-      scope.expects(:lookupvar).with('caller_module_name').returns('bar')
-      scope.source.expects(:name).returns('foo::baz')
-      scope.source.expects(:type).returns('definition')
+  context 'when called from private definition' do
+    it 'fails with a class error message' do
+      expect(scope).to receive(:lookupvar).with('module_name').and_return('foo')
+      expect(scope).to receive(:lookupvar).with('caller_module_name').and_return('bar')
+      expect(scope.source).to receive(:name).and_return('foo::baz')
+      expect(scope.source).to receive(:type).and_return('definition')
 
-      is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /Definition foo::baz is private/)
+      is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{Definition foo::baz is private})
     end
   end
 end