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

diff --git a/3rdparty/modules/stdlib/spec/functions/squeeze_spec.rb b/3rdparty/modules/stdlib/spec/functions/squeeze_spec.rb
old mode 100755
new mode 100644
index b267d9ad5..ee144b308
--- a/3rdparty/modules/stdlib/spec/functions/squeeze_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/squeeze_spec.rb
@@ -2,8 +2,8 @@ require 'spec_helper'
 
 describe 'squeeze' 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.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(1).and_raise_error(NoMethodError) }
   it { is_expected.to run.with_params({}).and_raise_error(NoMethodError) }
   it { is_expected.to run.with_params(true).and_raise_error(NoMethodError) }
@@ -16,7 +16,7 @@ describe 'squeeze' do
     it { is_expected.to run.with_params('aaaaaaaaabbbbbbbbbbcccccccccc', 'b-c').and_return('aaaaaaaaabc') }
   end
 
-  context 'should run with UTF8 and double byte characters' do
+  context 'with UTF8 and double byte characters' do
     it { is_expected.to run.with_params('ậậậậậậậậậậậậậậậậậậậậ').and_return('ậ') }
     it { is_expected.to run.with_params('語語語語語語語', '語').and_return('語') }
     it { is_expected.to run.with_params('ậậậậậậậậậậậậậậậậậ語語語語©©©©©', '©').and_return('ậậậậậậậậậậậậậậậậậ語語語語©') }
@@ -26,24 +26,24 @@ describe 'squeeze' do
     it {
       is_expected.to run \
         .with_params(['', 'a', 'aaaaaaaaa', 'aaaaaaaaabbbbbbbbbbcccccccccc']) \
-        .and_return( ['', 'a', 'a',         'abc'])
+        .and_return(['', 'a', 'a', 'abc'])
     }
     it {
       is_expected.to run \
         .with_params(['', 'a', 'aaaaaaaaa', 'aaaaaaaaabbbbbbbbbbcccccccccc'], 'a') \
-        .and_return( ['', 'a', 'a',         'abbbbbbbbbbcccccccccc'])
+        .and_return(['', 'a', 'a', 'abbbbbbbbbbcccccccccc'])
     }
     it {
       is_expected.to run \
         .with_params(['', 'a', 'aaaaaaaaa', 'aaaaaaaaabbbbbbbbbbcccccccccc'], 'b-c') \
-        .and_return( ['', 'a', 'aaaaaaaaa', 'aaaaaaaaabc'])
+        .and_return(['', 'a', 'aaaaaaaaa', 'aaaaaaaaabc'])
     }
   end
 
   context 'when using a class extending String' do
-    it 'should call its squeeze method' do
+    it 'calls its squeeze method' do
       value = AlsoString.new('aaaaaaaaa')
-      value.expects(:squeeze).returns('foo')
+      expect_any_instance_of(AlsoString).to receive(:squeeze).and_return('foo') # rubocop:disable RSpec/AnyInstance
       expect(subject).to run.with_params(value).and_return('foo')
     end
   end