diff test/functional/my_controller_test.rb @ 51:371eac10df0b live

* Merge from "cannam" branch. This includes update to Redmine trunk, plus welcome/tip-of-the-day from luisf branch.

--- a/test/functional/my_controller_test.rb	Thu Oct 21 11:19:14 2010 +0100
+++ b/test/functional/my_controller_test.rb	Wed Nov 24 12:20:08 2010 +0000
@@ -68,7 +68,7 @@
                              :login => "root",
                              :admin => 1,
                              :custom_field_values => {"4" => "0100562500"}}
-    assert_redirected_to 'my/account'
+    assert_redirected_to '/my/account'
     user = User.find(2)
     assert_equal user, assigns(:user)
     assert_equal "Joe", user.firstname
@@ -102,7 +102,7 @@
     post :password, :password => 'jsmith',
                     :new_password => 'hello',
                     :new_password_confirmation => 'hello'
-    assert_redirected_to 'my/account'
+    assert_redirected_to '/my/account'
     assert User.try_to_login('jsmith', 'hello')
   end