summaryrefslogtreecommitdiffstats
path: root/test/functional/project_enumerations_controller_test.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-11 09:23:52 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2014-01-11 09:23:52 +0000
commit6e8d8da1f3a2b46db9afb2226cd9f96925368f41 (patch)
tree3a69cfaf786dfcc23dd0e9fb51195505b8a97d31 /test/functional/project_enumerations_controller_test.rb
parente11c68e417323c2776a3758582240ce4aad7daa7 (diff)
downloadredmine-6e8d8da1f3a2b46db9afb2226cd9f96925368f41.tar.gz
redmine-6e8d8da1f3a2b46db9afb2226cd9f96925368f41.zip
Rails4: replace deprecated Relation#update_all at ProjectEnumerationsControllerTest
git-svn-id: http://svn.redmine.org/redmine/trunk@12632 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/project_enumerations_controller_test.rb')
-rw-r--r--test/functional/project_enumerations_controller_test.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/test/functional/project_enumerations_controller_test.rb b/test/functional/project_enumerations_controller_test.rb
index 474438633..15aa57cc1 100644
--- a/test/functional/project_enumerations_controller_test.rb
+++ b/test/functional/project_enumerations_controller_test.rb
@@ -212,7 +212,8 @@ class ProjectEnumerationsControllerTest < ActionController::TestCase
:active => true
})
assert project_activity.save
- assert TimeEntry.update_all("activity_id = '#{project_activity.id}'", ["project_id = ? AND activity_id = ?", 1, 9])
+ assert TimeEntry.where(["project_id = ? AND activity_id = ?", 1, 9]).
+ update_all("activity_id = '#{project_activity.id}'")
assert_equal 3, TimeEntry.where(:activity_id => project_activity.id,
:project_id => 1).count
delete :destroy, :project_id => 1