Merge pull request #433 from cmurphy/fix_acceptance

Fix acceptance tests for #405
xbezdick · Apr 10, 2015 · cf7dbef · cf7dbef
2 parents afec0ab + 65116da
commit cf7dbef
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 64 deletions.
diff --git a/spec/acceptance/fqdn_rand_base64_spec.rb b/spec/acceptance/fqdn_rand_base64_spec.rb
diff --git a/spec/acceptance/fqdn_rand_string_spec.rb b/spec/acceptance/fqdn_rand_string_spec.rb
@@ -44,7 +44,7 @@
       pp = <<-eos
       $l = 10
       $s = 'seed'
-      $o = fqdn_rand_string($l, $s)
+      $o = fqdn_rand_string($l, undef, $s)
       notice(inline_template('fqdn_rand_string is <%= @o.inspect %>'))
       eos
 

diff --git a/spec/acceptance/pw_hash_spec.rb b/spec/acceptance/pw_hash_spec.rb
@@ -6,7 +6,7 @@
   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 @@
 
     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