Don't pass conditions to #delete_all.

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

6 files changed, 12 insertions, 12 deletions

diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index a713ddfdb..4752fb389 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -160,7 +160,7 @@ class AdminControllerTest < Redmine::ControllerTest
   private
 
   def delete_configuration_data
-    Role.delete_all('builtin = 0')
+    Role.where('builtin = 0').delete_all
     Tracker.delete_all
     IssueStatus.delete_all
     Enumeration.delete_all
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index af43b5012..bf84302b8 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -71,7 +71,7 @@ class IssuesControllerTest < Redmine::ControllerTest
   end
 
   def test_index_should_not_list_issues_when_module_disabled
-    EnabledModule.delete_all("name = 'issue_tracking' AND project_id = 1")
+    EnabledModule.where("name = 'issue_tracking' AND project_id = 1").delete_all
     get :index
     assert_response :success
     assert_template 'index'
@@ -1231,7 +1231,7 @@ class IssuesControllerTest < Redmine::ControllerTest
 
   def test_show_should_display_update_form_with_minimal_permissions
     Role.find(1).update_attribute :permissions, [:view_issues, :add_issue_notes]
-    WorkflowTransition.delete_all :role_id => 1
+    WorkflowTransition.where(:role_id => 1).delete_all
 
     @request.session[:user_id] = 2
     get :show, :id => 1
@@ -1796,7 +1796,7 @@ class IssuesControllerTest < Redmine::ControllerTest
 
   def test_get_new_with_minimal_permissions
     Role.find(1).update_attribute :permissions, [:add_issues]
-    WorkflowTransition.delete_all :role_id => 1
+    WorkflowTransition.where(:role_id => 1).delete_all
 
     @request.session[:user_id] = 2
     get :new, :project_id => 1, :tracker_id => 1
@@ -2833,7 +2833,7 @@ class IssuesControllerTest < Redmine::ControllerTest
   end
 
   def setup_without_workflow_privilege
-    WorkflowTransition.delete_all(["role_id = ?", Role.anonymous.id])
+    WorkflowTransition.where(["role_id = ?", Role.anonymous.id]).delete_all
     Role.anonymous.add_permission! :add_issues, :add_issue_notes
   end
   private :setup_without_workflow_privilege
@@ -2900,7 +2900,7 @@ class IssuesControllerTest < Redmine::ControllerTest
   end
 
   def setup_with_workflow_privilege
-    WorkflowTransition.delete_all(["role_id = ?", Role.anonymous.id])
+    WorkflowTransition.where(["role_id = ?", Role.anonymous.id]).delete_all
     WorkflowTransition.create!(:role => Role.anonymous, :tracker_id => 1,
                                :old_status_id => 1, :new_status_id => 3)
     WorkflowTransition.create!(:role => Role.anonymous, :tracker_id => 1,
@@ -4531,7 +4531,7 @@ class IssuesControllerTest < Redmine::ControllerTest
     # Fixes random test failure with Mysql
     # where Issue.where(:project_id => 2).limit(2).order('id desc')
     # doesn't return the expected results
-    Issue.delete_all("project_id=2")
+    Issue.where("project_id=2").delete_all
 
     @request.session[:user_id] = 2
     assert_difference 'Issue.count', 2 do
diff --git a/test/unit/default_data_test.rb b/test/unit/default_data_test.rb
index 60dee7ad7..c22e9341f 100644
--- a/test/unit/default_data_test.rb
+++ b/test/unit/default_data_test.rb
@@ -23,7 +23,7 @@ class DefaultDataTest < ActiveSupport::TestCase
 
   def test_no_data
     assert !Redmine::DefaultData::Loader::no_data?
-    Role.delete_all("builtin = 0")
+    Role.where("builtin = 0").delete_all
     Tracker.delete_all
     IssueStatus.delete_all
     Enumeration.delete_all
@@ -33,7 +33,7 @@ class DefaultDataTest < ActiveSupport::TestCase
   def test_load
     valid_languages.each do |lang|
       begin
-        Role.delete_all("builtin = 0")
+        Role.where("builtin = 0").delete_all
         Tracker.delete_all
         IssueStatus.delete_all
         Enumeration.delete_all
diff --git a/test/unit/news_test.rb b/test/unit/news_test.rb
index d97233be5..825a47260 100644
--- a/test/unit/news_test.rb
+++ b/test/unit/news_test.rb
@@ -46,7 +46,7 @@ class NewsTest < ActiveSupport::TestCase
   end
 
   def test_should_not_include_news_for_projects_with_news_disabled
-    EnabledModule.delete_all(["project_id = ? AND name = ?", 2, 'news'])
+    EnabledModule.where(["project_id = ? AND name = ?", 2, 'news']).delete_all
     project = Project.find(2)
 
     # Add a piece of news to the project
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index ef23e397c..ff513a276 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -1051,7 +1051,7 @@ class UserTest < ActiveSupport::TestCase
   end
 
   def test_own_account_deletable_should_be_false_for_a_single_admin
-    User.delete_all(["admin = ? AND id <> ?", true, 1])
+    User.where(["admin = ? AND id <> ?", true, 1]).delete_all
 
     with_settings :unsubscribe => '1' do
       assert_equal false, User.find(1).own_account_deletable?
diff --git a/test/unit/watcher_test.rb b/test/unit/watcher_test.rb
index 8ffca148a..e44857dfb 100644
--- a/test/unit/watcher_test.rb
+++ b/test/unit/watcher_test.rb
@@ -150,7 +150,7 @@ class WatcherTest < ActiveSupport::TestCase
   end
 
   def test_prune_with_user
-    Watcher.delete_all("user_id = 9")
+    Watcher.where("user_id = 9").delete_all
     user = User.find(9)
 
     # public