Merge branch 'master' into 4.3.x

1 files changed, 12 insertions, 12 deletions

diff --git a/spec/functions/is_domain_name_spec.rb b/spec/functions/is_domain_name_spec.rb
index f2ea76d..4d05f5c 100755
--- a/spec/functions/is_domain_name_spec.rb
+++ b/spec/functions/is_domain_name_spec.rb
@@ -5,60 +5,60 @@ describe "the is_domain_name function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
-    Puppet::Parser::Functions.function("is_domain_name").should == "function_is_domain_name"
+    expect(Puppet::Parser::Functions.function("is_domain_name")).to eq("function_is_domain_name")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_is_domain_name([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_is_domain_name([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should return true if a valid short domain name" do
     result = scope.function_is_domain_name(["x.com"])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should return true if the domain is ." do
     result = scope.function_is_domain_name(["."])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should return true if the domain is x.com." do
     result = scope.function_is_domain_name(["x.com."])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should return true if a valid domain name" do
     result = scope.function_is_domain_name(["foo.bar.com"])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should allow domain parts to start with numbers" do
     result = scope.function_is_domain_name(["3foo.2bar.com"])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should allow domain to end with a dot" do
     result = scope.function_is_domain_name(["3foo.2bar.com."])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should allow a single part domain" do
     result = scope.function_is_domain_name(["orange"])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should return false if domain parts start with hyphens" do
     result = scope.function_is_domain_name(["-3foo.2bar.com"])
-    result.should(be_false)
+    expect(result).to(be_falsey)
   end
 
   it "should return true if domain contains hyphens" do
     result = scope.function_is_domain_name(["3foo-bar.2bar-fuzz.com"])
-    result.should(be_true)
+    expect(result).to(be_truthy)
   end
 
   it "should return false if domain name contains spaces" do
     result = scope.function_is_domain_name(["not valid"])
-    result.should(be_false)
+    expect(result).to(be_falsey)
   end
 end