Merge branch 'master' into 4.3.x

1 files changed, 11 insertions, 11 deletions

diff --git a/spec/functions/to_bytes_spec.rb b/spec/functions/to_bytes_spec.rb
index d1ea4c8..68a1eb8 100755
--- a/spec/functions/to_bytes_spec.rb
+++ b/spec/functions/to_bytes_spec.rb
@@ -6,53 +6,53 @@ describe "the to_bytes function" do
   let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
 
   it "should exist" do
-    Puppet::Parser::Functions.function("to_bytes").should == "function_to_bytes"
+    expect(Puppet::Parser::Functions.function("to_bytes")).to eq("function_to_bytes")
   end
 
   it "should raise a ParseError if there is less than 1 arguments" do
-    lambda { scope.function_to_bytes([]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_to_bytes([]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should convert kB to B" do
     result = scope.function_to_bytes(["4 kB"])
-    result.should(eq(4096))
+    expect(result).to(eq(4096))
   end
 
   it "should work without B in unit" do
     result = scope.function_to_bytes(["4 k"])
-    result.should(eq(4096))
+    expect(result).to(eq(4096))
   end
 
   it "should work without a space before unit" do
     result = scope.function_to_bytes(["4k"])
-    result.should(eq(4096))
+    expect(result).to(eq(4096))
   end
 
   it "should work without a unit" do
     result = scope.function_to_bytes(["5678"])
-    result.should(eq(5678))
+    expect(result).to(eq(5678))
   end
 
   it "should convert fractions" do
     result = scope.function_to_bytes(["1.5 kB"])
-    result.should(eq(1536))
+    expect(result).to(eq(1536))
   end
 
   it "should convert scientific notation" do
     result = scope.function_to_bytes(["1.5e2 B"])
-    result.should(eq(150))
+    expect(result).to(eq(150))
   end
 
   it "should do nothing with a positive number" do
     result = scope.function_to_bytes([5678])
-    result.should(eq(5678))
+    expect(result).to(eq(5678))
   end
 
   it "should should raise a ParseError if input isn't a number" do
-    lambda { scope.function_to_bytes(["foo"]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_to_bytes(["foo"]) }.to( raise_error(Puppet::ParseError))
   end
 
   it "should should raise a ParseError if prefix is unknown" do
-    lambda { scope.function_to_bytes(["5 uB"]) }.should( raise_error(Puppet::ParseError))
+    expect { scope.function_to_bytes(["5 uB"]) }.to( raise_error(Puppet::ParseError))
   end
 end