Mercurial > hg > soundsoftware-site
diff test/functional/project_enumerations_controller_test.rb @ 38:33d69fee1d99 cannam
* Merge SVN update from default branch
| author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
|---|---|
| date | Fri, 19 Nov 2010 13:41:40 +0000 |
| parents | 94944d00e43c |
| children | af80e5618e9b 8661b858af72 |
line wrap: on
line diff
--- a/test/functional/project_enumerations_controller_test.rb Fri Oct 01 15:33:14 2010 +0100 +++ b/test/functional/project_enumerations_controller_test.rb Fri Nov 19 13:41:40 2010 +0000 @@ -20,7 +20,7 @@ } assert_response :redirect - assert_redirected_to 'projects/ecookbook/settings/activities' + assert_redirected_to '/projects/ecookbook/settings/activities' # Created project specific activities... project = Project.find('ecookbook') @@ -83,7 +83,7 @@ } assert_response :redirect - assert_redirected_to 'projects/ecookbook/settings/activities' + assert_redirected_to '/projects/ecookbook/settings/activities' # Created project specific activities... project = Project.find('ecookbook') @@ -159,7 +159,7 @@ delete :destroy, :project_id => 1 assert_response :redirect - assert_redirected_to 'projects/ecookbook/settings/activities' + assert_redirected_to '/projects/ecookbook/settings/activities' assert_nil TimeEntryActivity.find_by_id(project_activity.id) assert_nil TimeEntryActivity.find_by_id(project_activity_two.id) @@ -179,7 +179,7 @@ delete :destroy, :project_id => 1 assert_response :redirect - assert_redirected_to 'projects/ecookbook/settings/activities' + assert_redirected_to '/projects/ecookbook/settings/activities' assert_nil TimeEntryActivity.find_by_id(project_activity.id) assert_equal 0, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size, "TimeEntries still assigned to project specific activity"