X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Fdos2unix_spec.rb;h=4b04f5bbad99019b5241015067dd256bf3915fcc;hb=30caaa85aed7015ca0d77216bff175eebd917eb7;hp=97abae7e3cea54648c871d58cd42be7644919a1b;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git

diff --git a/3rdparty/modules/stdlib/spec/functions/dos2unix_spec.rb b/3rdparty/modules/stdlib/spec/functions/dos2unix_spec.rb
index 97abae7e3..4b04f5bba 100644
--- a/3rdparty/modules/stdlib/spec/functions/dos2unix_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/dos2unix_spec.rb
@@ -1,47 +1,47 @@
 require 'spec_helper'
 
 describe 'dos2unix' do
-  context 'Checking parameter validity' do
+  context 'when checking parameter validity' do
     it { is_expected.not_to eq(nil) }
     it do
-      is_expected.to run.with_params.and_raise_error(ArgumentError, /Wrong number of arguments/)
+      is_expected.to run.with_params.and_raise_error(ArgumentError, %r{Wrong number of arguments})
     end
     it do
-      is_expected.to run.with_params('one', 'two').and_raise_error(ArgumentError, /Wrong number of arguments/)
+      is_expected.to run.with_params('one', 'two').and_raise_error(ArgumentError, %r{Wrong number of arguments})
     end
     it do
-      is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError)
+      is_expected.to run.with_params([]).and_raise_error(Puppet::ParseError, %r{Requires string as argument})
     end
     it do
-      is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError)
+      is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, %r{Requires string as argument})
     end
     it do
-      is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError)
+      is_expected.to run.with_params(1).and_raise_error(Puppet::ParseError, %r{Requires string as argument})
     end
   end
 
-  context 'Converting from dos to unix format' do
+  context 'when converting from dos to unix format' do
     sample_text    = "Hello\r\nWorld\r\n"
     desired_output = "Hello\nWorld\n"
 
-    it 'should output unix format' do
-      should run.with_params(sample_text).and_return(desired_output)
+    it 'outputs unix format' do
+      is_expected.to run.with_params(sample_text).and_return(desired_output)
     end
   end
 
-  context 'Internationalization (i18N) values' do
+  context 'with internationalization (i18N) values' do
     sample_text_utf8    = "Ħ℮ļłǿ\r\nשׁөŕłđ\r\n"
     desired_output_utf8 = "Ħ℮ļłǿ\nשׁөŕłđ\n"
 
     sample_text_doublebyte    = "こんにちは\r\n世界\r\n"
     desired_output_doublebyte = "こんにちは\n世界\n"
 
-    it 'should output uft8 string' do
-      should run.with_params(sample_text_utf8).and_return(desired_output_utf8)
+    it 'outputs uft8 string' do
+      is_expected.to run.with_params(sample_text_utf8).and_return(desired_output_utf8)
     end
 
-    it 'should output double byte string' do
-      should run.with_params(sample_text_doublebyte).and_return(desired_output_doublebyte)
+    it 'outputs double byte string' do
+      is_expected.to run.with_params(sample_text_doublebyte).and_return(desired_output_doublebyte)
     end
   end
 end