diff test/functional/enumerations_controller_test.rb @ 1526:404aa68d4227

Merge from live branch

--- a/test/functional/enumerations_controller_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/functional/enumerations_controller_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2014  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
@@ -117,7 +117,7 @@
   end
 
   def test_destroy_enumeration_in_use_with_reassignment
-    issue = Issue.find(:first, :conditions => {:priority_id => 4})
+    issue = Issue.where(:priority_id => 4).first
     assert_difference 'IssuePriority.count', -1 do
       delete :destroy, :id => 4, :reassign_to_id => 6
     end
@@ -126,4 +126,11 @@
     # check that the issue was reassign
     assert_equal 6, issue.reload.priority_id
   end
+
+  def test_destroy_enumeration_in_use_with_blank_reassignment
+    assert_no_difference 'IssuePriority.count' do
+      delete :destroy, :id => 4, :reassign_to_id => ''
+    end
+    assert_response :success
+  end
 end