diff options
| author | Bryan Jen <bryan.jen@gmail.com> | 2015-04-10 10:05:02 -0700 |
|---|---|---|
| committer | Bryan Jen <bryan.jen@gmail.com> | 2015-04-10 10:05:02 -0700 |
| commit | cf7dbef1e8ac3b3c25398f4d985530113148e03f (patch) | |
| tree | eb45b4bedf5f90354ac6b1011ed6dee835507849 /spec/acceptance/pw_hash_spec.rb | |
| parent | afec0ab9813524d894969f0b113d02bbe378289c (diff) | |
| parent | 65116dafd507c5111044853861f9b10b02c91854 (diff) | |
| download | puppet-stdlib-cf7dbef1e8ac3b3c25398f4d985530113148e03f.tar.gz puppet-stdlib-cf7dbef1e8ac3b3c25398f4d985530113148e03f.tar.bz2 | |
Merge pull request #433 from cmurphy/fix_acceptance
Fix acceptance tests for #405
Diffstat (limited to 'spec/acceptance/pw_hash_spec.rb')
| -rw-r--r-- | spec/acceptance/pw_hash_spec.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/acceptance/pw_hash_spec.rb b/spec/acceptance/pw_hash_spec.rb index 4768975..eddb782 100644 --- a/spec/acceptance/pw_hash_spec.rb +++ b/spec/acceptance/pw_hash_spec.rb @@ -6,7 +6,7 @@ describe 'pw_hash function', :unless => (UNSUPPORTED_PLATFORMS + ['windows', 'Da describe 'success' do it 'hashes passwords' do pp = <<-EOS - $o = pw_hash('password', 6, 'salt') + $o = pw_hash('password', 'sha-512', 'salt') notice(inline_template('pw_hash is <%= @o.inspect %>')) EOS @@ -17,12 +17,12 @@ describe 'pw_hash function', :unless => (UNSUPPORTED_PLATFORMS + ['windows', 'Da it 'returns nil if no password is provided' do pp = <<-EOS - $o = pw_hash('', 6, 'salt') + $o = pw_hash('', 'sha-512', 'salt') notice(inline_template('pw_hash is <%= @o.inspect %>')) EOS apply_manifest(pp, :catch_failures => true) do |r| - expect(r.stdout).to match(/pw_hash is ""/) + expect(r.stdout).to match(/pw_hash is nil/) end end end |