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

diff --git a/3rdparty/modules/stdlib/spec/functions/fqdn_rotate_spec.rb b/3rdparty/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
old mode 100755
new mode 100644
index 7c1038a3d..7cd9f1d0b
--- a/3rdparty/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
+++ b/3rdparty/modules/stdlib/spec/functions/fqdn_rotate_spec.rb
@@ -2,9 +2,9 @@ require 'spec_helper'
 
 describe 'fqdn_rotate' 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(0).and_raise_error(Puppet::ParseError, /Requires either array or string to work with/) }
-  it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, /Requires either array or string to work with/) }
+  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(0).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work with}) }
+  it { is_expected.to run.with_params({}).and_raise_error(Puppet::ParseError, %r{Requires either array or string to work with}) }
   it { is_expected.to run.with_params('').and_return('') }
   it { is_expected.to run.with_params('a').and_return('a') }
   it { is_expected.to run.with_params('ã').and_return('ã') }
@@ -12,53 +12,51 @@ describe 'fqdn_rotate' do
   it { is_expected.to run.with_params([]).and_return([]) }
   it { is_expected.to run.with_params(['a']).and_return(['a']) }
 
-  it "should rotate a string and the result should be the same size" do
-    expect(fqdn_rotate("asdf").size).to eq(4)
+  it 'rotates a string and the result should be the same size' do
+    expect(fqdn_rotate('asdf').size).to eq(4)
   end
 
-  it "should rotate a string to give the same results for one host" do
-    val1 = fqdn_rotate("abcdefg", :host => 'one')
-    val2 = fqdn_rotate("abcdefg", :host => 'one')
+  it 'rotates a string to give the same results for one host' do
+    val1 = fqdn_rotate('abcdefg', :host => 'one')
+    val2 = fqdn_rotate('abcdefg', :host => 'one')
     expect(val1).to eq(val2)
   end
 
-  it "allows extra arguments to control the random rotation on a single host" do
-    val1 = fqdn_rotate("abcdefg", :extra_identifier => [1, "different", "host"])
-    val2 = fqdn_rotate("abcdefg", :extra_identifier => [2, "different", "host"])
+  it 'allows extra arguments to control the random rotation on a single host' do
+    val1 = fqdn_rotate('abcdefg', :extra_identifier => [1, 'different', 'host'])
+    val2 = fqdn_rotate('abcdefg', :extra_identifier => [2, 'different', 'host'])
     expect(val1).not_to eq(val2)
   end
 
-  it "considers the same host and same extra arguments to have the same random rotation" do
-    val1 = fqdn_rotate("abcdefg", :extra_identifier => [1, "same", "host"])
-    val2 = fqdn_rotate("abcdefg", :extra_identifier => [1, "same", "host"])
+  it 'considers the same host and same extra arguments to have the same random rotation' do
+    val1 = fqdn_rotate('abcdefg', :extra_identifier => [1, 'same', 'host'])
+    val2 = fqdn_rotate('abcdefg', :extra_identifier => [1, 'same', 'host'])
     expect(val1).to eq(val2)
   end
 
-  it "should rotate a string to give different values on different hosts" do
-    val1 = fqdn_rotate("abcdefg", :host => 'one')
-    val2 = fqdn_rotate("abcdefg", :host => 'two')
+  it 'rotates a string to give different values on different hosts' do
+    val1 = fqdn_rotate('abcdefg', :host => 'one')
+    val2 = fqdn_rotate('abcdefg', :host => 'two')
     expect(val1).not_to eq(val2)
   end
 
-  it "should accept objects which extend String" do
+  it 'accepts objects which extend String' do
     result = fqdn_rotate(AlsoString.new('asdf'))
     expect(result).to eq('dfas')
   end
 
-  it "should use the Puppet::Util.deterministic_rand function" do
-    if Puppet::Util.respond_to?(:deterministic_rand)
-      Puppet::Util.expects(:deterministic_rand).with(44489829212339698569024999901561968770,4)
-      fqdn_rotate("asdf")
-    else
-      skip 'Puppet::Util#deterministic_rand not available'
-    end
+  it 'uses the Puppet::Util.deterministic_rand function' do
+    skip 'Puppet::Util#deterministic_rand not available' unless Puppet::Util.respond_to?(:deterministic_rand)
+
+    expect(Puppet::Util).to receive(:deterministic_rand).with(44_489_829_212_339_698_569_024_999_901_561_968_770, 4)
+    fqdn_rotate('asdf')
   end
 
-  it "should not leave the global seed in a deterministic state" do
-    fqdn_rotate("asdf")
-    rand1 = rand()
-    fqdn_rotate("asdf")
-    rand2 = rand()
+  it 'does not leave the global seed in a deterministic state' do
+    fqdn_rotate('asdf')
+    rand1 = rand
+    fqdn_rotate('asdf')
+    rand2 = rand
     expect(rand1).not_to eql(rand2)
   end
 
@@ -68,7 +66,7 @@ describe 'fqdn_rotate' do
 
     # workaround not being able to use let(:facts) because some tests need
     # multiple different hostnames in one context
-    scope.stubs(:lookupvar).with("::fqdn").returns(host)
+    allow(scope).to receive(:lookupvar).with('::fqdn').and_return(host)
 
     function_args = [value] + extra
     scope.function_fqdn_rotate(function_args)