[PATCH conductor 4/4] fix conductor spec suite on ruby 1.9

Mo Morsi mmorsi at redhat.com
Wed May 2 13:48:54 UTC 2012


  spec suite now fully runs successfully
---
 .../controllers/permissions_controller_spec.rb     |    2 +-
 src/spec/controllers/pools_controller_spec.rb      |    5 ++++-
 src/spec/models/instance_spec.rb                   |    6 +++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/spec/controllers/permissions_controller_spec.rb b/src/spec/controllers/permissions_controller_spec.rb
index dedf655..050fdf8 100644
--- a/src/spec/controllers/permissions_controller_spec.rb
+++ b/src/spec/controllers/permissions_controller_spec.rb
@@ -34,7 +34,7 @@ describe PermissionsController do
     @permission = FactoryGirl.create(:permission, :user => @admin, :role => @old_role, :permission_object => @deployable)
 
     post :multi_update, :permission_object_id => @deployable.id, :permission_object_type => @deployable.class.to_s,
-        :permission_role_selected => "#{@permission.id},#{@new_role.id}", :polymorphic_path_extras => { 'catalog_id' => @catalog.id}
+        :permission_role_selected => ["#{@permission.id},#{@new_role.id}"], :polymorphic_path_extras => { 'catalog_id' => @catalog.id}
 
     response.should redirect_to catalog_deployable_path(@catalog, @deployable)
   end
diff --git a/src/spec/controllers/pools_controller_spec.rb b/src/spec/controllers/pools_controller_spec.rb
index 21af9d0..ba68755 100644
--- a/src/spec/controllers/pools_controller_spec.rb
+++ b/src/spec/controllers/pools_controller_spec.rb
@@ -119,7 +119,10 @@ describe PoolsController do
     describe "#destroy" do
       before do
         @pool = Factory.build(:pool)
-        Pool.stub!(:find).and_return([@pool])
+        @tpool = Factory.build(:tpool)
+        @pool.save!
+        @tpool.save!
+        Pool.stub!(:find).and_return([@pool], @tpool)
         delete :multi_destroy, :pools_selected => [@pool.id], :format => :json
       end
 
diff --git a/src/spec/models/instance_spec.rb b/src/spec/models/instance_spec.rb
index edcc68d..11a1a62 100644
--- a/src/spec/models/instance_spec.rb
+++ b/src/spec/models/instance_spec.rb
@@ -16,6 +16,8 @@
 
 require 'spec_helper'
 
+require 'csv'
+
 describe Instance do
   before(:each) do
     @quota = FactoryGirl.create :quota
@@ -257,7 +259,9 @@ describe Instance do
   end
 
   it "should return csv header string for export" do
-    reader = CSV::Reader.create(Instance.csv_export([FactoryGirl.create(:instance)]))
+    reader = CSV.const_defined?(:Reader) ?
+               CSV::Reader.create(Instance.csv_export([FactoryGirl.create(:instance)])) :
+               CSV.parse(Instance.csv_export([FactoryGirl.create(:instance)]))
     header = reader.shift
       ['Status_code','Event_time','Summary','Source_type','Description','Source_id'].each do |attribute|
         header[0].split(';').include?(attribute).should be_true
-- 
1.7.6.5




More information about the aeolus-devel mailing list