From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sat, 11 Jan 2014 09:23:52 +0000 (+0000)
Subject: Rails4: replace deprecated Relation#update_all at ProjectEnumerationsControllerTest
X-Git-Tag: 2.5.0~267
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6e8d8da1f3a2b46db9afb2226cd9f96925368f41;p=redmine.git

Rails4: replace deprecated Relation#update_all at ProjectEnumerationsControllerTest

git-svn-id: http://svn.redmine.org/redmine/trunk@12632 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

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