diff options
author | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-05 16:16:34 -0400 |
---|---|---|
committer | Morgan Haskel <morgan@puppetlabs.com> | 2014-06-05 16:16:34 -0400 |
commit | ffe21fc67491c4502114505c82142781d72720ab (patch) | |
tree | 7f0ee09079863a19f07e0bb999e387eedb32e17e /spec/functions/str2saltedsha512_spec.rb | |
parent | f9f6e92dffa8364cfbbd92a6a65f4be4ef176d2c (diff) | |
parent | 6287a200af558d277f83b919e8409f6c798eef39 (diff) |
Merge pull request #268 from apenney/rspec3
Rspec3 changes
Diffstat (limited to 'spec/functions/str2saltedsha512_spec.rb')
-rwxr-xr-x | spec/functions/str2saltedsha512_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/functions/str2saltedsha512_spec.rb b/spec/functions/str2saltedsha512_spec.rb index df8fb8e..ab7f57f 100755 --- a/spec/functions/str2saltedsha512_spec.rb +++ b/spec/functions/str2saltedsha512_spec.rb @@ -5,7 +5,7 @@ describe "the str2saltedsha512 function" do let(:scope) { PuppetlabsSpec::PuppetInternals.scope } it "should exist" do - Puppet::Parser::Functions.function("str2saltedsha512").should == "function_str2saltedsha512" + expect(Puppet::Parser::Functions.function("str2saltedsha512")).to eq("function_str2saltedsha512") end it "should raise a ParseError if there is less than 1 argument" do @@ -18,7 +18,7 @@ describe "the str2saltedsha512 function" do it "should return a salted-sha512 password hash 136 characters in length" do result = scope.function_str2saltedsha512(["password"]) - result.length.should(eq(136)) + expect(result.length).to(eq(136)) end it "should raise an error if you pass a non-string password" do @@ -40,6 +40,6 @@ describe "the str2saltedsha512 function" do # Combine the Binary Salt with 'password' and compare the end result saltedpass = Digest::SHA512.digest(str_salt + 'password') result = (str_salt + saltedpass).unpack('H*')[0] - result.should == password_hash + expect(result).to eq(password_hash) end end |