[PATCH conductor] v2 Bug 678390 - some failed provider acct field checks return blank page

[Richard Su]

Removed a redundant test.

Check username and password are not blank before calling deltacloud validation.
---
 src/app/models/provider_account.rb       |    3 +++
 src/spec/models/provider_account_spec.rb |    6 ++++++
 2 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb
index 33c7d2e..9858219 100644
--- a/src/app/models/provider_account.rb
+++ b/src/app/models/provider_account.rb
@@ -163,6 +163,9 @@ class ProviderAccount < ActiveRecord::Base
   end

def valid_credentials?
+    if credentials_hash['username'].blank? || credentials_hash['password'].blank?
+      return false
+    end
     DeltaCloud::valid_credentials?(credentials_hash['username'].to_s, credentials_hash['password'].to_s, provider.url)
   end

diff --git a/src/spec/models/provider_account_spec.rb b/src/spec/models/provider_account_spec.rb
index 6845ed2..df49708 100644
--- a/src/spec/models/provider_account_spec.rb
+++ b/src/spec/models/provider_account_spec.rb
@@ -23,6 +23,12 @@ describe ProviderAccount do
     invalid_provider_account.credentials_hash = {'username' => "wrong_username", 'password' => "wrong_password"}
     invalid_provider_account.should_not be_valid

+    ec2_provider = Factory :ec2_provider
+    invalid_ec2_provider_account = Factory.build(:ec2_provider_account, :provider => ec2_provider)
+    invalid_ec2_provider_account.credentials_hash = {'username' => "", 'password' => nil}
+    invalid_ec2_provider_account.valid_credentials?.should == false
+    invalid_ec2_provider_account.should_not be_valid
+
     valid_provider_account = Factory.build(:mock_provider_account, :provider => mock_provider)
     valid_provider_account.should be_valid
   end

[Jirka Tomasek]

ACK

Dne 1.4.2011 03:38, Richard Su napsal(a):
> Removed a redundant test.
> Check username and password are not blank before calling deltacloud validation.
>
> src/app/models/provider_account.rb       |    3 +++
>   src/spec/models/provider_account_spec.rb |    6 ++++++
>   2 files changed, 9 insertions(+), 0 deletions(-)
>
> diff --git a/src/app/models/provider_account.rb b/src/app/models/provider_account.rb
> index 33c7d2e..9858219 100644
> --- a/src/app/models/provider_account.rb
> +++ b/src/app/models/provider_account.rb
> @@ -163,6 +163,9 @@ class ProviderAccount<  ActiveRecord::Base
>     end
> def valid_credentials?
> if credentials_hash['username'].blank? || credentials_hash['password'].blank?
>  return false
> end
>  DeltaCloud::valid_credentials?(credentials_hash['username'].to_s, credentials_hash['password'].to_s, provider.url)
> end
>
> diff --git a/src/spec/models/provider_account_spec.rb b/src/spec/models/provider_account_spec.rb
> index 6845ed2..df49708 100644
> --- a/src/spec/models/provider_account_spec.rb
> +++ b/src/spec/models/provider_account_spec.rb
> @@ -23,6 +23,12 @@ describe ProviderAccount do
>       invalid_provider_account.credentials_hash = {'username' =>  "wrong_username", 'password' =>  "wrong_password"}
>       invalid_provider_account.should_not be_valid
> ec2_provider = Factory :ec2_provider
> invalid_ec2_provider_account = Factory.build(:ec2_provider_account, :provider =>  ec2_provider)
> invalid_ec2_provider_account.credentials_hash = {'username' =>  "", 'password' =>  nil}
> invalid_ec2_provider_account.valid_credentials?.should == false
> invalid_ec2_provider_account.should_not be_valid
> valid_provider_account = Factory.build(:mock_provider_account, :provider =>  mock_provider)
> valid_provider_account.should be_valid
> end