X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=3rdparty%2Fmodules%2Fstdlib%2Fspec%2Ffunctions%2Funix2dos_spec.rb;h=a6af64f086982e07e94549bbda81f26672d8eaed;hb=59812388abf4638d6065ffda934d1866af902302;hp=8537a26faea3b41123f0ec5c56caae653de34388;hpb=6963202b4b62c2816655ac9532521b018fdf83bd;p=mirror%2Fdsa-puppet.git diff --git a/3rdparty/modules/stdlib/spec/functions/unix2dos_spec.rb b/3rdparty/modules/stdlib/spec/functions/unix2dos_spec.rb index 8537a26fa..a6af64f08 100644 --- a/3rdparty/modules/stdlib/spec/functions/unix2dos_spec.rb +++ b/3rdparty/modules/stdlib/spec/functions/unix2dos_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' describe 'unix2dos' 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) @@ -20,21 +20,21 @@ describe 'unix2dos' do end end - context 'Converting from unix to dos format' do + context 'when converting from unix to dos format' do sample_text = "Hello\nWorld\n" desired_output = "Hello\r\nWorld\r\n" - it 'should output dos format' do - should run.with_params(sample_text).and_return(desired_output) + it 'outputs dos format' do + is_expected.to run.with_params(sample_text).and_return(desired_output) end end - context 'Converting from dos to dos format' do + context 'when converting from dos to dos format' do sample_text = "Hello\r\nWorld\r\n" desired_output = "Hello\r\nWorld\r\n" - it 'should output dos format' do - should run.with_params(sample_text).and_return(desired_output) + it 'outputs dos format' do + is_expected.to run.with_params(sample_text).and_return(desired_output) end end end