Merge branch 'master' into 4.3.x

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/functions/flatten_spec.rb b/spec/functions/flatten_spec.rb
index dba7a6b..de8c66d 100755
--- a/spec/functions/flatten_spec.rb
+++ b/spec/functions/flatten_spec.rb
@@ -4,24 +4,24 @@ require 'spec_helper'
 describe "the flatten function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
   it "should exist" do
-    Puppet::Parser::Functions.function("flatten").should == "function_flatten"
+    expect(Puppet::Parser::Functions.function("flatten")).to eq("function_flatten")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_flatten([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_flatten([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should raise a ParseError if there is more than 1 argument" do
-    lambda { scope.function_flatten([[], []]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_flatten([[], []]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should flatten a complex data structure" do
     result = scope.function_flatten([["a","b",["c",["d","e"],"f","g"]]])
-    result.should(eq(["a","b","c","d","e","f","g"]))
+    expect(result).to(eq(["a","b","c","d","e","f","g"]))
   end
 
   it "should do nothing to a structure that is already flat" do
     result = scope.function_flatten([["a","b","c","d"]])
-    result.should(eq(["a","b","c","d"]))
+    expect(result).to(eq(["a","b","c","d"]))
   end
 end