[PATCH conductor 2/7] Modifies monkeypatch for ProviderAccount in specs
pblaho at redhat.com
pblaho at redhat.com
Wed Aug 15 17:11:25 UTC 2012
From: Petr Blaho <pblaho at redhat.com>
Removes monkeypatch for ProviderAccount#valid_credentials? in
spec/spec_helper/rb
Adds some stubs so tests work without mentioned monkeypatch
---
.../provider_accounts_controller_spec.rb | 8 ++++++--
src/spec/models/provider_account_spec.rb | 1 +
src/spec/spec_helper.rb | 6 +++---
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb
index 456aedb..10327eb 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
@@ -19,7 +19,6 @@ require 'spec_helper'
describe ProviderAccountsController do
render_views
-
context "UI" do
fixtures :all
@@ -277,7 +276,12 @@ describe ProviderAccountsController do
end
context "of ec2 provider" do
- let(:provider_account) { FactoryGirl.create(:ec2_provider_account); ProviderAccount.last }
+ let(:provider_account) do
+ provider_account = FactoryGirl.build(:ec2_provider_account)
+ DeltaCloud.stub(:valid_credentials?).and_return(true)
+ provider_account.save
+ provider_account
+ end
it_behaves_like "having correct set of credentials"
end
diff --git a/src/spec/models/provider_account_spec.rb b/src/spec/models/provider_account_spec.rb
index 756e10f..8820be9 100644
--- a/src/spec/models/provider_account_spec.rb
+++ b/src/spec/models/provider_account_spec.rb
@@ -87,6 +87,7 @@ describe ProviderAccount do
end
it "when calling connect and it fails with exception it will return nil" do
+ DeltaCloud.stub(:new).and_raise(Exception)
@provider_account.connect.should be_nil
end
diff --git a/src/spec/spec_helper.rb b/src/spec/spec_helper.rb
index 1149fcf..dd47849 100644
--- a/src/spec/spec_helper.rb
+++ b/src/spec/spec_helper.rb
@@ -84,9 +84,9 @@ ProviderAccount.class_eval do
nil
end
- def valid_credentials?
- true
- end
+# def valid_credentials?
+# true
+# end
end
RSpec.configure do |config|
--
1.7.7.6
More information about the aeolus-devel
mailing list