Fixed tests for ActiveRecord 3.1

Andrew Kane
1 parent f1e1a36f
Showing 4 changed files with 19 additions and 14 deletions Show diff stats
lib/groupdate.rb
lib/groupdate/enumerable.rb
test/array_test.rb
test/enumerable_test.rb
 require "active_support/time"
 require "groupdate/version"
 require "groupdate/magic"
-require "groupdate/enumerable"
 require "groupdate/active_record"
+require "groupdate/enumerable"
 module Groupdate
   mattr_accessor :week_start, :day_start, :time_zone
 module Enumerable
-  [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day].each do |field|
-    define_method :"group_by_#{field}" do |options = {}, &block|
-      Groupdate::Magic.new(field, options).group_by(self, &block)
+  # skip due to ActiveRecord bug
+  unless ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
+    [:second, :minute, :hour, :day, :week, :month, :year, :day_of_week, :hour_of_day].each do |field|
+      define_method :"group_by_#{field}" do |options = {}, &block|
+        Groupdate::Magic.new(field, options).group_by(self, &block)
+      end
     end
   end
@@ -1,10 +0,0 @@
-require_relative "test_helper"
-
-class TestArray < Minitest::Unit::TestCase
-  include TestGroupdate
-
-  def call_method(method, field, options)
-    Hash[ User.all.to_a.send(:"group_by_#{method}", options){|u| u.send(field) }.map{|k, v| [k, v.size] } ]
-  end
-
-end
@@ -0,0 +1,12 @@
+require_relative "test_helper"
+
+unless ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
+  class TestEnumerable < Minitest::Unit::TestCase
+    include TestGroupdate
+
+    def call_method(method, field, options)
+      Hash[ User.all.to_a.send(:"group_by_#{method}", options){|u| u.send(field) }.map{|k, v| [k, v.size] } ]
+    end
+
+  end
+end
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-require_relative "test_helper"
2	-
3	-class TestArray < Minitest::Unit::TestCase
4	- include TestGroupdate
5	-
6	- def call_method(method, field, options)
7	- Hash[ User.all.to_a.send(:"group_by_#{method}", options){\|u\| u.send(field) }.map{\|k, v\| [k, v.size] } ]
8	- end
9	-
10	-end
@@ -0,0 +1,12 @@		@@ -0,0 +1,12 @@
	1	+require_relative "test_helper"
	2	+
	3	+unless ActiveRecord::VERSION::MAJOR == 3 and ActiveRecord::VERSION::MINOR < 2
	4	+ class TestEnumerable < Minitest::Unit::TestCase
	5	+ include TestGroupdate
	6	+
	7	+ def call_method(method, field, options)
	8	+ Hash[ User.all.to_a.send(:"group_by_#{method}", options){\|u\| u.send(field) }.map{\|k, v\| [k, v.size] } ]
	9	+ end
	10	+
	11	+ end
	12	+end