Merge branch 'master' into 4.3.x

1 files changed, 4 insertions, 4 deletions

diff --git a/spec/functions/upcase_spec.rb b/spec/functions/upcase_spec.rb
index 5db5513..78e55dd 100755
--- a/spec/functions/upcase_spec.rb
+++ b/spec/functions/upcase_spec.rb
@@ -5,20 +5,20 @@ describe "the upcase function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
-    Puppet::Parser::Functions.function("upcase").should == "function_upcase"
+    expect(Puppet::Parser::Functions.function("upcase")).to eq("function_upcase")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_upcase([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_upcase([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should upcase a string" do
     result = scope.function_upcase(["abc"])
-    result.should(eq('ABC'))
+    expect(result).to(eq('ABC'))
   end
 
   it "should do nothing if a string is already upcase" do
     result = scope.function_upcase(["ABC"])
-    result.should(eq('ABC'))
+    expect(result).to(eq('ABC'))
   end
 end