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

diff --git a/3rdparty/modules/stdlib/spec/functions/to_bytes_spec.rb b/3rdparty/modules/stdlib/spec/functions/to_bytes_spec.rb
old mode 100755
new mode 100644
index 2be23ff2d..f3efd90f0
--- a/3rdparty/modules/stdlib/spec/functions/to_bytes_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/to_bytes_spec.rb
@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe 'to_bytes' 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('1', 'extras').and_raise_error(Puppet::ParseError, /wrong number of arguments/i) }
-  it { is_expected.to run.with_params([]).and_raise_error(TypeError, /(can't convert|no implicit conversion of) Array (in)?to String/) }
-  it { is_expected.to run.with_params({}).and_raise_error(TypeError, /(can't convert|no implicit conversion of) Hash (in)?to String/) }
-  it { is_expected.to run.with_params(true).and_raise_error(TypeError, /(can't convert|no implicit conversion of) (TrueClass|true) (in)?to String/) }
+  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('1', 'extras').and_raise_error(Puppet::ParseError, %r{wrong number of arguments}i) }
+  it { is_expected.to run.with_params([]).and_raise_error(TypeError, %r{(can't convert|no implicit conversion of) Array (in)?to String}) }
+  it { is_expected.to run.with_params({}).and_raise_error(TypeError, %r{(can't convert|no implicit conversion of) Hash (in)?to String}) }
+  it { is_expected.to run.with_params(true).and_raise_error(TypeError, %r{(can't convert|no implicit conversion of) (TrueClass|true) (in)?to String}) }
 
   describe 'when passing numbers' do
     it { is_expected.to run.with_params(0).and_return(0) }
@@ -28,22 +28,20 @@ describe 'to_bytes' do
     describe 'with a unit' do
       it { is_expected.to run.with_params('1k').and_return(1024) }
       it { is_expected.to run.with_params('-1kB').and_return(-1024) }
-      it { is_expected.to run.with_params('1k').and_return(1024) }
-      it { is_expected.to run.with_params('1M').and_return(1024*1024) }
-      it { is_expected.to run.with_params('1G').and_return(1024*1024*1024) }
-      it { is_expected.to run.with_params('1T').and_return(1024*1024*1024*1024) }
-      it { is_expected.to run.with_params('1P').and_return(1024*1024*1024*1024*1024) }
-      it { is_expected.to run.with_params('1E').and_return(1024*1024*1024*1024*1024*1024) }
-      it { is_expected.to run.with_params('1.5e3M').and_return(1572864000) }
+      it { is_expected.to run.with_params('1M').and_return(1024 * 1024) }
+      it { is_expected.to run.with_params('1G').and_return(1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('1T').and_return(1024 * 1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('1P').and_return(1024 * 1024 * 1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('1E').and_return(1024 * 1024 * 1024 * 1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('1.5e3M').and_return(1_572_864_000) }
 
-      it { is_expected.to run.with_params('4k').and_return(4*1024) }
-      it { is_expected.to run.with_params('-4kB').and_return(4*-1024) }
-      it { is_expected.to run.with_params('4k').and_return(4*1024) }
-      it { is_expected.to run.with_params('4M').and_return(4*1024*1024) }
-      it { is_expected.to run.with_params('4G').and_return(4*1024*1024*1024) }
-      it { is_expected.to run.with_params('4T').and_return(4*1024*1024*1024*1024) }
-      it { is_expected.to run.with_params('4P').and_return(4*1024*1024*1024*1024*1024) }
-      it { is_expected.to run.with_params('4E').and_return(4*1024*1024*1024*1024*1024*1024) }
+      it { is_expected.to run.with_params('4k').and_return(4 * 1024) }
+      it { is_expected.to run.with_params('-4kB').and_return(4 * -1024) }
+      it { is_expected.to run.with_params('4M').and_return(4 * 1024 * 1024) }
+      it { is_expected.to run.with_params('4G').and_return(4 * 1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('4T').and_return(4 * 1024 * 1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('4P').and_return(4 * 1024 * 1024 * 1024 * 1024 * 1024) }
+      it { is_expected.to run.with_params('4E').and_return(4 * 1024 * 1024 * 1024 * 1024 * 1024 * 1024) }
 
       # these are so wrong
       it { is_expected.to run.with_params('1.0001 k').and_return(1024) }
@@ -51,12 +49,12 @@ describe 'to_bytes' do
     end
 
     describe 'with a unknown unit' do
-      it { is_expected.to run.with_params('1KB').and_raise_error(Puppet::ParseError, /Unknown prefix/) }
-      it { is_expected.to run.with_params('1K').and_raise_error(Puppet::ParseError, /Unknown prefix/) }
-      it { is_expected.to run.with_params('1mb').and_raise_error(Puppet::ParseError, /Unknown prefix/) }
-      it { is_expected.to run.with_params('1m').and_raise_error(Puppet::ParseError, /Unknown prefix/) }
-      it { is_expected.to run.with_params('1%').and_raise_error(Puppet::ParseError, /Unknown prefix/) }
-      it { is_expected.to run.with_params('1 p').and_raise_error(Puppet::ParseError, /Unknown prefix/) }
+      it { is_expected.to run.with_params('1KB').and_raise_error(Puppet::ParseError, %r{Unknown prefix}) }
+      it { is_expected.to run.with_params('1K').and_raise_error(Puppet::ParseError, %r{Unknown prefix}) }
+      it { is_expected.to run.with_params('1mb').and_raise_error(Puppet::ParseError, %r{Unknown prefix}) }
+      it { is_expected.to run.with_params('1m').and_raise_error(Puppet::ParseError, %r{Unknown prefix}) }
+      it { is_expected.to run.with_params('1%').and_raise_error(Puppet::ParseError, %r{Unknown prefix}) }
+      it { is_expected.to run.with_params('1 p').and_raise_error(Puppet::ParseError, %r{Unknown prefix}) }
     end
   end