Merge branch 'master' into 4.3.x

1 files changed, 5 insertions, 5 deletions

diff --git a/spec/functions/strftime_spec.rb b/spec/functions/strftime_spec.rb
index df42b6f..ebec54b 100755
--- a/spec/functions/strftime_spec.rb
+++ b/spec/functions/strftime_spec.rb
@@ -5,25 +5,25 @@ describe "the strftime function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
-    Puppet::Parser::Functions.function("strftime").should == "function_strftime"
+    expect(Puppet::Parser::Functions.function("strftime")).to eq("function_strftime")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_strftime([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_strftime([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "using %s should be higher then when I wrote this test" do
     result = scope.function_strftime(["%s"])
-    result.to_i.should(be > 1311953157)
+    expect(result.to_i).to(be > 1311953157)
   end
 
   it "using %s should be lower then 1.5 trillion" do
     result = scope.function_strftime(["%s"])
-    result.to_i.should(be < 1500000000)
+    expect(result.to_i).to(be < 1500000000)
   end
 
   it "should return a date when given %Y-%m-%d" do
     result = scope.function_strftime(["%Y-%m-%d"])
-    result.should =~ /^\d{4}-\d{2}-\d{2}$/
+    expect(result).to match(/^\d{4}-\d{2}-\d{2}$/)
   end
 end