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

diff --git a/3rdparty/modules/stdlib/spec/functions/validate_re_spec.rb b/3rdparty/modules/stdlib/spec/functions/validate_re_spec.rb
old mode 100755
new mode 100644
index 353118297..270e2b1ac
--- a/3rdparty/modules/stdlib/spec/functions/validate_re_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/validate_re_spec.rb
@@ -1,55 +1,55 @@
 require 'spec_helper'
 
 describe 'validate_re' do
-  after(:all) do
+  after(:each) do
     ENV.delete('STDLIB_LOG_DEPRECATIONS')
   end
 
   # Checking for deprecation warning
-  it 'should display a single deprecation' do
-    ENV['STDLIB_LOG_DEPRECATIONS'] = "true"
-    scope.expects(:warning).with(includes('This method is deprecated'))
+  it 'displays a single deprecation' do
+    ENV['STDLIB_LOG_DEPRECATIONS'] = 'true'
+    expect(scope).to receive(:warning).with(include('This method is deprecated'))
     is_expected.to run.with_params('', '')
   end
 
   describe 'signature validation' do
     it { is_expected.not_to eq(nil) }
-    it { is_expected.to run.with_params().and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-    it { is_expected.to run.with_params('').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-    it { is_expected.to run.with_params('', '', '', 'extra').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
+    it { is_expected.to run.with_params.and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+    it { is_expected.to run.with_params('').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+    it { is_expected.to run.with_params('', '', '', 'extra').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
 
     describe 'valid inputs' do
       it { is_expected.to run.with_params('', '') }
       it { is_expected.to run.with_params('', ['']) }
       it { is_expected.to run.with_params('', [''], 'custom error') }
       it { is_expected.to run.with_params('one', '^one') }
-      it { is_expected.to run.with_params('one', [ '^one', '^two' ]) }
-      it { is_expected.to run.with_params('one', [ '^one', '^two' ], 'custom error') }
+      it { is_expected.to run.with_params('one', ['^one', '^two']) }
+      it { is_expected.to run.with_params('one', ['^one', '^two'], 'custom error') }
     end
 
     describe 'invalid inputs' do
-      it { is_expected.to run.with_params('', []).and_raise_error(Puppet::ParseError, /does not match/) }
-      it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, /does not match/) }
-      it { is_expected.to run.with_params('', 'two').and_raise_error(Puppet::ParseError, /does not match/) }
-      it { is_expected.to run.with_params('', ['two']).and_raise_error(Puppet::ParseError, /does not match/) }
-      it { is_expected.to run.with_params('', ['two'], 'custom error').and_raise_error(Puppet::ParseError, /custom error/) }
-      it { is_expected.to run.with_params('notone', '^one').and_raise_error(Puppet::ParseError, /does not match/) }
-      it { is_expected.to run.with_params('notone', [ '^one', '^two' ]).and_raise_error(Puppet::ParseError, /does not match/) }
-      it { is_expected.to run.with_params('notone', [ '^one', '^two' ], 'custom error').and_raise_error(Puppet::ParseError, /custom error/) }
+      it { is_expected.to run.with_params('', []).and_raise_error(Puppet::ParseError, %r{does not match}) }
+      it { is_expected.to run.with_params('one', 'two').and_raise_error(Puppet::ParseError, %r{does not match}) }
+      it { is_expected.to run.with_params('', 'two').and_raise_error(Puppet::ParseError, %r{does not match}) }
+      it { is_expected.to run.with_params('', ['two']).and_raise_error(Puppet::ParseError, %r{does not match}) }
+      it { is_expected.to run.with_params('', ['two'], 'custom error').and_raise_error(Puppet::ParseError, %r{custom error}) }
+      it { is_expected.to run.with_params('notone', '^one').and_raise_error(Puppet::ParseError, %r{does not match}) }
+      it { is_expected.to run.with_params('notone', ['^one', '^two']).and_raise_error(Puppet::ParseError, %r{does not match}) }
+      it { is_expected.to run.with_params('notone', ['^one', '^two'], 'custom error').and_raise_error(Puppet::ParseError, %r{custom error}) }
+    end
 
-      describe 'non-string inputs' do
-        [
-          1,             # Fixnum
-          3.14,          # Float
-          nil,           # NilClass
-          true,          # TrueClass
-          false,         # FalseClass
-          ["10"],        # Array
-          :key,          # Symbol
-          {:key=>"val"}, # Hash
-        ].each do |input|
-          it { is_expected.to run.with_params(input, '.*').and_raise_error(Puppet::ParseError, /needs to be a String/) }
-        end
+    describe 'non-string inputs' do
+      [
+        1,             # Fixnum
+        3.14,          # Float
+        nil,           # NilClass
+        true,          # TrueClass
+        false,         # FalseClass
+        ['10'],        # Array
+        :key,          # Symbol
+        { :key => 'val' }, # Hash
+      ].each do |input|
+        it { is_expected.to run.with_params(input, '.*').and_raise_error(Puppet::ParseError, %r{needs to be a String}) }
       end
     end
   end