Mercurial > hg > soundsoftware-site
diff test/functional/.svn/text-base/project_enumerations_controller_test.rb.svn-base @ 120:cd2282d2aa55 cannam
Merge from the default branch. Note that this is not a valid SVN repository any more (use default, redmine-1.1 etc for SVN updates).
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:33:08 +0000 |
parents | af80e5618e9b 8661b858af72 |
children |
line wrap: on
line diff
--- a/test/functional/.svn/text-base/project_enumerations_controller_test.rb.svn-base Thu Jan 13 13:21:03 2011 +0000 +++ b/test/functional/.svn/text-base/project_enumerations_controller_test.rb.svn-base Thu Jan 13 14:33:08 2011 +0000 @@ -175,7 +175,7 @@ }) assert project_activity.save assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9]) - assert 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size + assert_equal 3, TimeEntry.find_all_by_activity_id_and_project_id(project_activity.id, 1).size delete :destroy, :project_id => 1 assert_response :redirect