Merge branch 'master' into 4.3.x

1 files changed, 8 insertions, 8 deletions

diff --git a/spec/functions/type_spec.rb b/spec/functions/type_spec.rb
index 8fec88f..9dfe9d7 100755
--- a/spec/functions/type_spec.rb
+++ b/spec/functions/type_spec.rb
@@ -4,40 +4,40 @@ require 'spec_helper'
 describe "the type function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
   it "should exist" do
-    Puppet::Parser::Functions.function("type").should == "function_type"
+    expect(Puppet::Parser::Functions.function("type")).to eq("function_type")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_type([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_type([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should return string when given a string" do
     result = scope.function_type(["aaabbbbcccc"])
-    result.should(eq('string'))
+    expect(result).to(eq('string'))
   end
 
   it "should return array when given an array" do
     result = scope.function_type([["aaabbbbcccc","asdf"]])
-    result.should(eq('array'))
+    expect(result).to(eq('array'))
   end
 
   it "should return hash when given a hash" do
     result = scope.function_type([{"a"=>1,"b"=>2}])
-    result.should(eq('hash'))
+    expect(result).to(eq('hash'))
   end
 
   it "should return integer when given an integer" do
     result = scope.function_type(["1"])
-    result.should(eq('integer'))
+    expect(result).to(eq('integer'))
   end
 
   it "should return float when given a float" do
     result = scope.function_type(["1.34"])
-    result.should(eq('float'))
+    expect(result).to(eq('float'))
   end
 
   it "should return boolean when given a boolean" do
     result = scope.function_type([true])
-    result.should(eq('boolean'))
+    expect(result).to(eq('boolean'))
   end
 end