Merge branch 'master' into 4.3.x

1 files changed, 7 insertions, 7 deletions

diff --git a/spec/functions/is_ip_address_spec.rb b/spec/functions/is_ip_address_spec.rb
index c0debb3..c16d12b 100755
--- a/spec/functions/is_ip_address_spec.rb
+++ b/spec/functions/is_ip_address_spec.rb
@@ -5,35 +5,35 @@ describe "the is_ip_address function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
-    Puppet::Parser::Functions.function("is_ip_address").should == "function_is_ip_address"
+    expect(Puppet::Parser::Functions.function("is_ip_address")).to eq("function_is_ip_address")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_ip_address([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_is_ip_address([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should return true if an IPv4 address" do
     result = scope.function_is_ip_address(["1.2.3.4"])
-    result.should(eq(true))
+    expect(result).to(eq(true))
   end
 
   it "should return true if a full IPv6 address" do
     result = scope.function_is_ip_address(["fe80:0000:cd12:d123:e2f8:47ff:fe09:dd74"])
-    result.should(eq(true))
+    expect(result).to(eq(true))
   end
 
   it "should return true if a compressed IPv6 address" do
     result = scope.function_is_ip_address(["fe00::1"])
-    result.should(eq(true))
+    expect(result).to(eq(true))
   end
 
   it "should return false if not valid" do
     result = scope.function_is_ip_address(["asdf"])
-    result.should(eq(false))
+    expect(result).to(eq(false))
   end
 
   it "should return false if IP octets out of range" do
     result = scope.function_is_ip_address(["1.1.1.300"])
-    result.should(eq(false))
+    expect(result).to(eq(false))
   end
 end