Merge branch 'master' into day_start

Andrew Kane
2 parents 5bc3573e f57ecf26
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
test/test_helper.rb
@@ -484,6 +484,7 @@ module TestGroupdate
     create_user time_str
     expected = expected.is_a?(Time) ? time_key(expected) : number_key(expected)
     assert_equal ordered_hash({expected => 1}), User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, options).order(method.to_s).count
+    assert_equal 1, User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, true, options).count[expected]
   end
  
   def assert_zeros(method, created_at, keys, range_start, range_end, time_zone = nil, options = {})
...	...	@@ -484,6 +484,7 @@ module TestGroupdate
484	484	create_user time_str
485	485	expected = expected.is_a?(Time) ? time_key(expected) : number_key(expected)
486	486	assert_equal ordered_hash({expected => 1}), User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, options).order(method.to_s).count
	487	+ assert_equal 1, User.send(:"group_by_#{method}", :created_at, time_zone ? "Pacific Time (US & Canada)" : nil, true, options).count[expected]
487	488	end
488	489
489	490	def assert_zeros(method, created_at, keys, range_start, range_end, time_zone = nil, options = {})
...	...