diff test/functional/timelog_controller_test.rb @ 23:ca82a3468d27 cannam

* Merge SVN update from default
author Chris Cannam <chris.cannam@soundsoftware.ac.uk>
date Fri, 24 Sep 2010 14:17:42 +0100
parents 40f7cfd4df19
children 94944d00e43c
line wrap: on
line diff
--- a/test/functional/timelog_controller_test.rb	Thu Sep 23 16:19:06 2010 +0100
+++ b/test/functional/timelog_controller_test.rb	Fri Sep 24 14:17:42 2010 +0100
@@ -283,7 +283,7 @@
     assert_not_nil assigns(:total_hours)
     assert_equal "162.90", "%.2f" % assigns(:total_hours)
     # display all time by default
-    assert_equal '2007-03-11'.to_date, assigns(:from)
+    assert_equal '2007-03-12'.to_date, assigns(:from)
     assert_equal '2007-04-22'.to_date, assigns(:to)
   end
   
@@ -325,8 +325,8 @@
     assert_equal 2, assigns(:entries).size
     assert_not_nil assigns(:total_hours)
     assert_equal 154.25, assigns(:total_hours)
-    # display all time by default
-    assert_equal '2007-03-11'.to_date, assigns(:from)
+    # display all time based on what's been logged
+    assert_equal '2007-03-12'.to_date, assigns(:from)
     assert_equal '2007-04-22'.to_date, assigns(:to)
   end