Merge "Remove ambiguity in stubbed methods in spec_helper"

2014-01-22 22:33:40 +00:00
parent 5d3a356a30 0b50e5d68d
commit 9b754c00ba
1 changed files with 3 additions and 1 deletions
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -31,7 +31,9 @@ shared_context 'image-stubs' do
      .with('secrets', 'openstack_identity_bootstrap_token')
      .and_return('bootstrap-token')

-    Chef::Recipe.any_instance.stub(:get_password).and_return('')
+    Chef::Recipe.any_instance.stub(:get_password)
+    .with('db', anything)
+    .and_return('')
    Chef::Recipe.any_instance.stub(:get_password)
      .with('service', 'openstack-image')
      .and_return('glance-pass')