test/test_helper.rb in groupdate-3.1.0 vs test/test_helper.rb in groupdate-3.1.1

@@ -223,20 +223,35 @@
       Date.parse("#{this_year}-01-01") => 0
     }
     assert_equal expected, User.group_by_year(:created_at, last: 3).count
   end
 
+  def test_last_hour_of_day
+    error = assert_raises(ArgumentError) { User.group_by_hour_of_day(:created_at, last: 3).count }
+    assert_equal "Cannot use last option with hour_of_day", error.message
+  end
+
   def test_current
     create_user "#{this_year - 3}-01-01"
     create_user "#{this_year - 1}-01-01"
     expected = {
       Date.parse("#{this_year - 2}-01-01") => 0,
       Date.parse("#{this_year - 1}-01-01") => 1
     }
     assert_equal expected, User.group_by_year(:created_at, last: 2, current: false).count
   end
 
+  def test_quarter_and_last
+    create_user "#{this_year}-#{this_quarters_month}-01"
+    create_user "#{this_year}-#{this_quarters_month - 6}-01"
+    expected = {
+      Date.parse("#{this_year}-#{this_quarters_month - 3}-01") => 0,
+      Date.parse("#{this_year}-#{this_quarters_month}-01") => 1
+    }
+    assert_equal expected, User.group_by_quarter(:created_at, last: 2).count
+  end
+
   def test_format_locale
     create_user "2014-10-01"
     assert_equal ({"Okt" => 1}), User.group_by_day(:created_at, format: "%b", locale: :de).count
   end
 
@@ -260,15 +275,17 @@
   end
 
   # permit
 
   def test_permit
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:day, :created_at, permit: %w(week)).count }
+    error = assert_raises(ArgumentError) { User.group_by_period(:day, :created_at, permit: %w(week)).count }
+    assert_equal "Unpermitted period", error.message
   end
 
   def test_permit_bad_period
-    assert_raises(ArgumentError, "Unpermitted period") { User.group_by_period(:bad_period, :created_at).count }
+    error = assert_raises(ArgumentError) { User.group_by_period(:bad_period, :created_at).count }
+    assert_equal "Unpermitted period", error.message
   end
 
   def test_permit_symbol_symbols
     assert_equal ({}), User.group_by_period(:day, :created_at, permit: [:day]).count
   end
@@ -1044,11 +1061,10 @@
     }
     assert_equal expected, result(:day, "2013-05-03", false)
   end
 
   def test_date_column_with_time_zone
-    # TODO change for Groupdate 3.0
     expected = {
       Date.parse("2013-05-02") => 1
     }
     assert_equal expected, result(:day, "2013-05-03", true)
   end
@@ -1144,9 +1160,13 @@
     expected = {}
     keys.each_with_index do |key, i|
       expected[Date.parse(key)] = i == 1 ? 1 : 0
     end
     assert_equal expected, call_method(method, :created_at, options.merge(series: true, time_zone: time_zone ? "Pacific Time (US & Canada)" : nil, range: Time.parse(range_start)..Time.parse(range_end)))
+  end
+
+  def this_quarters_month
+    Time.now.utc.beginning_of_quarter.month
   end
 
   def this_year
     Time.now.utc.year
   end