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

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_legacy_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_legacy_spec.rb
index 7b48f1220..6c65d5e7d 100644
--- a/3rdparty/modules/stdlib/spec/functions/validate_legacy_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_legacy_spec.rb
@@ -6,61 +6,49 @@ if Puppet::Util::Package.versioncmp(Puppet.version, '4.4.0') >= 0
     it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
 
     describe 'when passing the type assertion and passing the previous validation' do
-      before do
-        scope.expects(:function_validate_foo).with([5]).once
-        Puppet.expects(:notice).never
-      end
       it 'passes without notice' do
+        expect(scope).to receive(:function_validate_foo).with([5]).once
+        expect(Puppet).to receive(:notice).never
         is_expected.to run.with_params('Integer', 'validate_foo', 5)
       end
     end
 
     describe 'when passing the type assertion and failing the previous validation' do
-      before do
-        scope.expects(:function_validate_foo).with([5]).raises(Puppet::ParseError, 'foo').once
-        Puppet.expects(:notice).with(includes('Accepting previously invalid value for target type'))
-      end
       it 'passes with a notice about newly accepted value' do
+        expect(scope).to receive(:function_validate_foo).with([5]).and_raise(Puppet::ParseError, 'foo').once
+        expect(Puppet).to receive(:notice).with(include('Accepting previously invalid value for target type'))
         is_expected.to run.with_params('Integer', 'validate_foo', 5)
       end
     end
 
     describe 'when failing the type assertion and passing the previous validation' do
-      before do
-        scope.expects(:function_validate_foo).with(['5']).once
-        subject.func.expects(:call_function).with('deprecation', 'validate_legacy', includes('Integer')).once
-      end
       it 'passes with a deprecation message' do
+        expect(scope).to receive(:function_validate_foo).with(['5']).once
+        expect(subject.func).to receive(:call_function).with('deprecation', 'validate_legacy', include('Integer')).once
         is_expected.to run.with_params('Integer', 'validate_foo', '5')
       end
     end
 
     describe 'when failing the type assertion and failing the previous validation' do
-      before do
-        scope.expects(:function_validate_foo).with(['5']).raises(Puppet::ParseError, 'foo').once
-        subject.func.expects(:call_function).with('fail', includes('Integer')).once
-      end
       it 'fails with a helpful message' do
+        expect(scope).to receive(:function_validate_foo).with(['5']).and_raise(Puppet::ParseError, 'foo').once
+        expect(subject.func).to receive(:call_function).with('fail', include('Integer')).once
         is_expected.to run.with_params('Integer', 'validate_foo', '5')
       end
     end
 
     describe 'when passing in undef' do
-      before do
-        scope.expects(:function_validate_foo).with([:undef]).once
-        Puppet.expects(:notice).never
-      end
       it 'works' do
+        expect(scope).to receive(:function_validate_foo).with([:undef]).once
+        expect(Puppet).to receive(:notice).never
         is_expected.to run.with_params('Optional[Integer]', 'validate_foo', :undef)
       end
     end
 
     describe 'when passing in multiple arguments' do
-      before do
-        scope.expects(:function_validate_foo).with([:undef, 1, 'foo']).once
-        Puppet.expects(:notice).never
-      end
       it 'passes with a deprecation message' do
+        expect(scope).to receive(:function_validate_foo).with([:undef, 1, 'foo']).once
+        expect(Puppet).to receive(:notice).never
         is_expected.to run.with_params('Optional[Integer]', 'validate_foo', :undef, 1, 'foo')
       end
     end