test/test_parsing.rb in chronic-0.1.2 vs test/test_parsing.rb in chronic-0.1.3

- old
+ new

@@ -298,14 +298,26 @@ time = Chronic.parse("last second", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 16, 13, 59, 59), time end - def test_parse_guess_grr + def test_parse_guess_grr time = Chronic.parse("yesterday at 4:00", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 15, 16), time + time = Chronic.parse("today at 9:00", :now => @time_2006_08_16_14_00_00) + assert_equal Time.local(2006, 8, 16, 9), time + + time = Chronic.parse("today at 2100", :now => @time_2006_08_16_14_00_00) + assert_equal Time.local(2006, 8, 16, 21), time + + time = Chronic.parse("this day at 0900", :now => @time_2006_08_16_14_00_00) + assert_equal Time.local(2006, 8, 16, 9), time + + time = Chronic.parse("tomorrow at 0900", :now => @time_2006_08_16_14_00_00) + assert_equal Time.local(2006, 8, 17, 9), time + time = Chronic.parse("yesterday at 4:00", :now => @time_2006_08_16_14_00_00, :ambiguous_time_range => :none) assert_equal Time.local(2006, 8, 15, 4), time time = Chronic.parse("last friday at 4:00", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 11, 16), time @@ -322,10 +334,13 @@ def test_parse_guess_grrr time = Chronic.parse("today at 6:00pm", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 16, 18), time + time = Chronic.parse("today at 6:00am", :now => @time_2006_08_16_14_00_00) + assert_equal Time.local(2006, 8, 16, 6), time + time = Chronic.parse("this day 1800", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 16, 18), time time = Chronic.parse("yesterday at 4:00pm", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 15, 16), time @@ -356,20 +371,20 @@ time = Chronic.parse("3 weeks ago", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 7, 26, 14, 30, 30), time time = Chronic.parse("3 days ago", :now => @time_2006_08_16_14_00_00) - assert_equal Time.local(2006, 8, 13, 14, 0, 30), time + assert_equal Time.local(2006, 8, 13, 14), time #time = Chronic.parse("1 monday ago", :now => @time_2006_08_16_14_00_00) #assert_equal Time.local(2006, 8, 14, 12), time time = Chronic.parse("5 mornings ago", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 12, 9), time time = Chronic.parse("7 hours ago", :now => @time_2006_08_16_14_00_00) - assert_equal Time.local(2006, 8, 16, 7, 0, 30), time + assert_equal Time.local(2006, 8, 16, 7), time time = Chronic.parse("3 minutes ago", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 16, 13, 57), time time = Chronic.parse("20 seconds before now", :now => @time_2006_08_16_14_00_00) @@ -388,27 +403,27 @@ time = Chronic.parse("1 week from now", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 23, 14, 30, 30), time time = Chronic.parse("1 day hence", :now => @time_2006_08_16_14_00_00) - assert_equal Time.local(2006, 8, 17, 14, 0, 30), time + assert_equal Time.local(2006, 8, 17, 14), time time = Chronic.parse("5 mornings hence", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 21, 9), time time = Chronic.parse("1 hour from now", :now => @time_2006_08_16_14_00_00) - assert_equal Time.local(2006, 8, 16, 15, 0, 30), time + assert_equal Time.local(2006, 8, 16, 15), time time = Chronic.parse("20 minutes hence", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 16, 14, 20), time time = Chronic.parse("20 seconds from now", :now => @time_2006_08_16_14_00_00) assert_equal Time.local(2006, 8, 16, 14, 0, 20), time end def test_parse_guess_p_s_r time = Chronic.parse("in 3 hours", :now => @time_2006_08_16_14_00_00) - assert_equal Time.local(2006, 8, 16, 17, 0, 30), time + assert_equal Time.local(2006, 8, 16, 17), time end def test_parse_guess_s_r_p_a # past \ No newline at end of file