Merge branch 'master' into 4.3.x

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/functions/fqdn_rotate_spec.rb b/spec/functions/fqdn_rotate_spec.rb
index 2577723..b2dc1f5 100755
--- a/spec/functions/fqdn_rotate_spec.rb
+++ b/spec/functions/fqdn_rotate_spec.rb
@@ -5,22 +5,22 @@ describe "the fqdn_rotate function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
-    Puppet::Parser::Functions.function("fqdn_rotate").should == "function_fqdn_rotate"
+    expect(Puppet::Parser::Functions.function("fqdn_rotate")).to eq("function_fqdn_rotate")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_fqdn_rotate([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_fqdn_rotate([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should rotate a string and the result should be the same size" do
     scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1")
     result = scope.function_fqdn_rotate(["asdf"])
-    result.size.should(eq(4))
+    expect(result.size).to(eq(4))
   end
 
   it "should rotate a string to give the same results for one host" do
     scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.1").twice
-    scope.function_fqdn_rotate(["abcdefg"]).should eql(scope.function_fqdn_rotate(["abcdefg"]))
+    expect(scope.function_fqdn_rotate(["abcdefg"])).to eql(scope.function_fqdn_rotate(["abcdefg"]))
   end
 
   it "should rotate a string to give different values on different hosts" do
@@ -28,6 +28,6 @@ describe "the fqdn_rotate function" do
      val1 = scope.function_fqdn_rotate(["abcdefghijklmnopqrstuvwxyz01234567890987654321"])
      scope.expects(:lookupvar).with("::fqdn").returns("127.0.0.2")
      val2 = scope.function_fqdn_rotate(["abcdefghijklmnopqrstuvwxyz01234567890987654321"])
-     val1.should_not eql(val2)
+     expect(val1).not_to eql(val2)
   end
 end