Mercurial > hg > soundsoftware-site

diff test/functional/project_enumerations_controller_test.rb @ 511:107d36338b70 live

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "cannam"
author Chris Cannam
date Thu, 14 Jul 2011 10:43:07 +0100
parents cd2282d2aa55
children 5e80956cc792
line wrap: on
line diff
--- a/test/functional/project_enumerations_controller_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/functional/project_enumerations_controller_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class ProjectEnumerationsControllerTest < ActionController::TestCase
   fixtures :all
@@ -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