Mercurial > hg > soundsoftware-site

diff test/functional/project_enumerations_controller_test.rb @ 524:1248a47e81b3 feature_36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from branch "luisf"
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 14:39:38 +0100
parents cd2282d2aa55
children 5e80956cc792
line wrap: on
line diff
--- a/test/functional/project_enumerations_controller_test.rb	Fri Jul 15 17:21:05 2011 +0100
+++ b/test/functional/project_enumerations_controller_test.rb	Mon Jul 25 14:39:38 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