diff test/functional/trackers_controller_test.rb @ 1517:dffacf8a6908 redmine-2.5

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/test/functional/trackers_controller_test.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/test/functional/trackers_controller_test.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -54,7 +54,7 @@
       post :create, :tracker => { :name => 'New tracker', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
     end
     assert_redirected_to :action => 'index'
-    tracker = Tracker.first(:order => 'id DESC')
+    tracker = Tracker.order('id DESC').first
     assert_equal 'New tracker', tracker.name
     assert_equal [1], tracker.project_ids.sort
     assert_equal Tracker::CORE_FIELDS, tracker.core_fields
@@ -67,7 +67,7 @@
       post :create, :tracker => { :name => 'New tracker', :core_fields => ['assigned_to_id', 'fixed_version_id', ''] }
     end
     assert_redirected_to :action => 'index'
-    tracker = Tracker.first(:order => 'id DESC')
+    tracker = Tracker.order('id DESC').first
     assert_equal 'New tracker', tracker.name
     assert_equal %w(assigned_to_id fixed_version_id), tracker.core_fields
   end
@@ -84,11 +84,12 @@
 
   def test_create_with_failure
     assert_no_difference 'Tracker.count' do
-      post :create, :tracker => { :name => '', :project_ids => ['1', '', ''], :custom_field_ids => ['1', '6', ''] }
+      post :create, :tracker => { :name => '', :project_ids => ['1', '', ''],
+                                  :custom_field_ids => ['1', '6', ''] }
     end
     assert_response :success
     assert_template 'new'
-    assert_error_tag :content => /name can't be blank/i
+    assert_error_tag :content => /name #{ESCAPED_CANT} be blank/i
   end
 
   def test_edit
@@ -153,7 +154,7 @@
     put :update, :id => 1, :tracker => { :name => '' }
     assert_response :success
     assert_template 'edit'
-    assert_error_tag :content => /name can't be blank/i
+    assert_error_tag :content => /name #{ESCAPED_CANT} be blank/i
   end
 
   def test_move_lower