diff test/unit/document_category_test.rb @ 1298:4f746d8966dd redmine_2.3_integration

Merge from redmine-2.3 branch to create new branch redmine-2.3-integration

--- a/test/unit/document_category_test.rb	Fri Jun 14 09:07:32 2013 +0100
+++ b/test/unit/document_category_test.rb	Fri Jun 14 09:28:30 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -34,14 +34,14 @@
   end
 
   def test_default
-    assert_nil DocumentCategory.find(:first, :conditions => { :is_default => true })
+    assert_nil DocumentCategory.where(:is_default => true).first
     e = Enumeration.find_by_name('Technical documentation')
     e.update_attributes(:is_default => true)
     assert_equal 3, DocumentCategory.default.id
   end
 
   def test_force_default
-    assert_nil DocumentCategory.find(:first, :conditions => { :is_default => true })
+    assert_nil DocumentCategory.where(:is_default => true).first
     assert_equal 1, DocumentCategory.default.id
   end
 end