spec/spec_helper.rb in magic_grid-0.12.3 vs spec/spec_helper.rb in magic_grid-0.12.4

@@ -17,20 +17,24 @@
 begin
   require 'will_paginate'
   require 'will_paginate/array'
   require 'will_paginate/view_helpers/action_view'
   puts "Testing with WillPaginate"
+  $will_paginate = true
 rescue LoadError
   puts "skipping WillPaginate"
+  $will_paginate = false
 end
 
 begin
   require 'kaminari'
   require 'kaminari/models/array_extension'
   puts "Testing with Kaminari"
+  $kaminari = true
 rescue LoadError
   puts "skipping Kaminari"
+  $kaminari = false
 end
 
 class NullObject
   def method_missing(*args, &block) self; end
   def nil?; true; end
@@ -75,18 +79,19 @@
     end
   end
 
   def fake_active_record_collection(table_name = 'some_table',
                                     columns = [:name, :description])
+    columns = columns.map{|c| {:name => c} }
     (1..1000).to_a.tap do |c|
-      c.stub(connection: fake_connection)
-      c.stub(quoted_table_name: table_name)
-      c.stub(table_name: table_name)
-      c.stub(to_sql: "SELECT * FROM MONKEYS")
+      c.stub(:connection => fake_connection)
+      c.stub(:quoted_table_name => table_name)
+      c.stub(:table_name => table_name)
+      c.stub(:to_sql => "SELECT * FROM MONKEYS")
       c.stub(:table) {
               double.tap do |t|
-                t.stub(:columns) { columns.map{|c| {name: c} } }
+                t.stub(:columns => columns)
               end
             }
       c.stub(:where) { c }
     end
   end
@@ -97,11 +102,11 @@
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
 
   config.include ActionView::Helpers
-  config.include WillPaginate::ActionView if Module.const_defined? :WillPaginate
-  config.include Kaminari::ActionViewExtension if Module.const_defined? :Kaminari
+  config.include WillPaginate::ActionView if $will_paginate
+  config.include Kaminari::ActionViewExtension if $kaminari
   config.include ActionFaker
   config.include FakeCollections
 
   config.before do
     MagicGrid.logger = NullObject.new