test/catch_up_test.rb in sifttter-redux-0.2.5 vs test/catch_up_test.rb in sifttter-redux-0.3.0

@@ -1,5 +1,6 @@
+require 'active_support/core_ext'
 require 'date'
 require 'test_helper'
 require File.join(File.dirname(__FILE__), '..', 'lib/sifttter-redux/date-range-maker.rb')
 
 class DefaultTest < Test::Unit::TestCase
@@ -14,43 +15,93 @@
   
   def test_yesterday
     assert_equal($drm.yesterday, (Date.today - 1..Date.today - 1))
   end
   
-  def test_last_7_days
-    assert_equal($drm.last_seven_days, (Date.today - 7...Date.today))
+  def test_last_5_days
+    assert_equal($drm.last_n_days(5), (Date.today - 5...Date.today))
   end
   
-  def test_last_7_days_include_today
-    assert_equal($drm.last_seven_days(true), (Date.today - 7..Date.today))
+  def test_last_5_days_include_today
+    assert_equal($drm.last_n_days(5, {:include_today => true}), (Date.today - 5..Date.today))
   end
   
+  def test_last_12_days
+    assert_equal($drm.last_n_days(12), (Date.today - 12...Date.today))
+  end
+  
+  def test_last_12_days_include_today
+    assert_equal($drm.last_n_days(12, {:include_today => true}), (Date.today - 12..Date.today))
+  end
+  
+  def test_current_week
+    end_date = Date.today.at_end_of_week
+    if Date.today.at_end_of_week > Date.today
+      end_date = Date.today
+    end
+      
+    assert_equal($drm.last_n_weeks, (Date.today.at_beginning_of_week...end_date))
+  end
+  
+  def test_current_week_include_today
+    end_date = Date.today.at_end_of_week
+    if Date.today.at_end_of_week > Date.today
+      end_date = Date.today
+    end
+      
+    assert_equal($drm.last_n_weeks(0, {:include_today => true}), (Date.today.at_beginning_of_week..end_date))
+  end
+  
+  def test_last_2_weeks
+    end_date = Date.today.at_end_of_week
+    if Date.today.at_end_of_week > Date.today
+      end_date = Date.today
+    end
+      
+    assert_equal($drm.last_n_weeks(2), (Date.today.at_beginning_of_week - 2.week...end_date))
+  end
+  
+  def test_last_2_weeks_include_today
+    end_date = Date.today.at_end_of_week
+    if Date.today.at_end_of_week > Date.today
+      end_date = Date.today
+    end
+      
+    assert_equal($drm.last_n_weeks(2, {:include_today => true}), (Date.today.at_beginning_of_week - 2.week..end_date))
+  end
+  
   def test_range_only_start_date
-    assert_equal($drm.range({:start_date => "2014-02-01"}), (Date.parse("2014-02-01")...Date.today))
+    assert_equal($drm.range("2014-02-01", nil), (Date.parse("2014-02-01")...Date.today))
   end
   
   def test_range_only_start_date_include_today
-    assert_equal($drm.range({:start_date => "2014-02-01", :include_today => true}), (Date.parse("2014-02-01")..Date.today))
+    assert_equal($drm.range("2014-02-01", nil, {:include_today => true}), (Date.parse("2014-02-01")..Date.today))
   end
   
   def test_range_start_date_and_end_date
-    assert_equal($drm.range({:start_date => "2014-02-01", :end_date => "2014-02-05"}), (Date.parse("2014-02-01")..Date.parse("2014-02-05")))
+    assert_equal($drm.range("2014-02-01", "2014-02-05"), (Date.parse("2014-02-01")..Date.parse("2014-02-05")))
   end
   
   def test_range_bad_dates
     assert_raise BadChronicDateError do
-      $drm.range({:start_date => "Bad Start Date", :end_date => "Bad End Date"})
+      $drm.range("Bad Start Date", "Bad End Date")
     end
   end
   
   def test_range_end_date_with_no_start_date
     assert_raise InvalidFlagsError do
-      $drm.range({:start_date => nil, :end_date => Date.today})
+      $drm.range(nil, Date.today)
     end
   end
   
   def test_range_end_date_before_start_date
     assert_raise BadDateOrderError do
-      $drm.range({:start_date => Date.today, :end_date => Date.today - 1})
+      $drm.range(Date.today, Date.today - 1)
+    end
+  end
+  
+  def test_range_negative_look_back
+    assert_raise NegativeDaysError do
+      $drm.last_n_days(-5)
     end
   end
 end