this patchset fix all spec tests
Show replies by date
---
src/spec/models/role_spec.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/spec/models/role_spec.rb b/src/spec/models/role_spec.rb
index 8adc580..4a6aa9f 100644
--- a/src/spec/models/role_spec.rb
+++ b/src/spec/models/role_spec.rb
@@ -7,6 +7,6 @@ describe Role do
u.name = ('a' * 256)
u.valid?.should be_false
u.errors[:name].should_not be_nil
- u.errors[:name].should =~ /^is too long.*/
+ u.errors[:name][0].should =~ /^is too long.*/
end
end
--
1.7.6
---
src/spec/models/pool_spec.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/spec/models/pool_spec.rb b/src/spec/models/pool_spec.rb
index adedc16..62c04e1 100644
--- a/src/spec/models/pool_spec.rb
+++ b/src/spec/models/pool_spec.rb
@@ -19,7 +19,7 @@ describe Pool do
u.name = ('a' * 256)
u.valid?.should be_false
u.errors[:name].should_not be_nil
- u.errors[:name].should =~ /^is too long.*/
+ u.errors[:name][0].should =~ /^is too long.*/
end
it "should not be destroyable when it has running instances" do
--
1.7.6
---
src/spec/models/pool_family_spec.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/spec/models/pool_family_spec.rb b/src/spec/models/pool_family_spec.rb
index c298668..9e64bb2 100644
--- a/src/spec/models/pool_family_spec.rb
+++ b/src/spec/models/pool_family_spec.rb
@@ -35,14 +35,14 @@ describe PoolFamily do
@pool_family.name = ('a' * 256)
@pool_family.valid?.should be_false
@pool_family.errors[:name].should_not be_nil
- @pool_family.errors[:name].should =~ /^is too long.*/
+ @pool_family.errors[:name][0].should =~ /^is too long.*/
end
it "should not be valid if name contains special characters" do
@pool_family.name = '.'
@pool_family.valid?.should be_false
@pool_family.errors[:name].should_not be_nil
- @pool_family.errors[:name].should =~ /^must only contain.*/
+ @pool_family.errors[:name][0].should =~ /^must only contain.*/
end
it "should require quota to be set" do
--
1.7.6
---
src/spec/controllers/users_controller_spec.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/spec/controllers/users_controller_spec.rb
b/src/spec/controllers/users_controller_spec.rb
index f85e3d7..a5c1cf7 100644
--- a/src/spec/controllers/users_controller_spec.rb
+++ b/src/spec/controllers/users_controller_spec.rb
@@ -36,7 +36,7 @@ describe UsersController do
returned_user = assigns[:user]
returned_user.errors.empty?.should be_false
returned_user.should have(2).errors_on(:login)
- returned_user.should have(2).errors_on(:email)
+ returned_user.should have(1).errors_on(:email)
returned_user.should have(1).error_on(:password)
returned_user.should have(1).error_on(:password_confirmation)
--
1.7.6
---
src/spec/factories/user.rb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/spec/factories/user.rb b/src/spec/factories/user.rb
index 8c222c0..44eb581 100644
--- a/src/spec/factories/user.rb
+++ b/src/spec/factories/user.rb
@@ -7,7 +7,7 @@ FactoryGirl.define do
first_name 'John'
last_name 'Smith'
association :quota
- after_build { |u| u.email ||= "#{u.login}(a)example.com" }
+ u.email { |e| "#{e.login}(a)example.host" }
end
factory :other_named_user, :parent => :user do
--
1.7.6
---
src/app/models/provider.rb | 3 ++-
src/spec/models/provider_spec.rb | 1 -
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/models/provider.rb b/src/app/models/provider.rb
index 1d70232..8eca2b5 100644
--- a/src/app/models/provider.rb
+++ b/src/app/models/provider.rb
@@ -51,6 +51,7 @@ class Provider < ActiveRecord::Base
validates_format_of :name, :with => /^[\w -]*$/n, :message => "must only
contain: numbers, letters, spaces, '_' and '-'"
validates_length_of :name, :maximum => 255
+ validate :validate_provider
has_many :permissions, :as => :permission_object, :dependent => :destroy,
:include => [:role],
@@ -106,4 +107,4 @@ class Provider < ActiveRecord::Base
connect.nil? ? false : true
end
-end
+end
\ No newline at end of file
diff --git a/src/spec/models/provider_spec.rb b/src/spec/models/provider_spec.rb
index dfbab75..0cb52bc 100644
--- a/src/spec/models/provider_spec.rb
+++ b/src/spec/models/provider_spec.rb
@@ -79,7 +79,6 @@ describe Provider do
instance = FactoryGirl.create(:instance)
provider = instance.provider_account.provider
- provider.destroy
provider.destroyed?.should be_false
end
end
--
1.7.6
---
src/spec/controllers/provider_controller_spec.rb | 33 ++++++++++++++++++++++
src/spec/spec_helper.rb | 3 +-
2 files changed, 34 insertions(+), 2 deletions(-)
create mode 100644 src/spec/controllers/provider_controller_spec.rb
diff --git a/src/spec/controllers/provider_controller_spec.rb
b/src/spec/controllers/provider_controller_spec.rb
new file mode 100644
index 0000000..64fad39
--- /dev/null
+++ b/src/spec/controllers/provider_controller_spec.rb
@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe ProvidersController do
+
+ fixtures :all
+ before(:each) do
+ @admin_permission = FactoryGirl.create :provider_admin_permission
+ @provider = @admin_permission.permission_object
+ @admin = @admin_permission.user
+ activate_authlogic
+ UserSession.create(@admin)
+ end
+
+ describe "provide ui to view hardware profiles" do
+ before do
+ get :show, :id => @provider.id, :details_tab => 'hw_profiles',
:format => :js
+ end
+
+ it { response.should render_template(:partial => 'providers/_hw_profiles')
}
+ it { response.should be_success }
+ it { assigns[:hardware_profiles].size.should == @provider.hardware_profiles.size }
+ end
+
+ describe "provide ui to view realms" do
+ before do
+ get :show, :id => @provider.id, :details_tab => 'realms', :format
=> :js
+ end
+
+ it { response.should be_success }
+ it { assigns[:realm_names].size.should == @provider.realms.size }
+ it { response.should render_template(:partial => "providers/_realms") }
+ end
+end
diff --git a/src/spec/spec_helper.rb b/src/spec/spec_helper.rb
index 716acc7..74799ff 100644
--- a/src/spec/spec_helper.rb
+++ b/src/spec/spec_helper.rb
@@ -12,7 +12,6 @@ Dir[Rails.root.join("spec/support/**/*.rb")].each {|f| require
f}
RSpec.configure do |config|
include Authlogic::TestCase
-
config.use_transactional_fixtures = true
config.use_instantiated_fixtures = false
config.fixture_path = Rails.root.join("spec/fixtures")
@@ -37,4 +36,4 @@ RSpec.configure do |config|
config.after(:each, :type => :controller) do
#current_user_session.destroy
end
-end
+end
\ No newline at end of file
--
1.7.6
---
.../controllers/deployments_controller_spec.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/spec/controllers/deployments_controller_spec.rb
b/src/spec/controllers/deployments_controller_spec.rb
index e64031d..53bcd30 100644
--- a/src/spec/controllers/deployments_controller_spec.rb
+++ b/src/spec/controllers/deployments_controller_spec.rb
@@ -21,7 +21,7 @@ describe DeploymentsController do
end.should change(Deployment, :count).by(-1)
end
- it "should allow RESTful delete of multiple deployments" do
+ it "should allow multi destroy of multiple deployments" do
UserSession.create(@admin)
deployment1 = nil
deployment2 = nil
@@ -32,7 +32,7 @@ describe DeploymentsController do
deployment2.save!
end.should change(Deployment, :count).by(2)
lambda do
- delete :destroy, :ids => [deployment1.id, deployment2.id]
+ post :multi_destroy, :deployments_selected => [deployment1.id, deployment2.id]
end.should change(Deployment, :count).by(-2)
end
--
1.7.6