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

Update to Redmine SVN revision 13367 on 2.5-stable branch

--- a/test/functional/news_controller_test.rb	Tue Sep 09 09:28:31 2014 +0100
+++ b/test/functional/news_controller_test.rb	Tue Sep 09 09:29:00 2014 +0100
@@ -102,8 +102,8 @@
           :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
       end
     end
-    attachment = Attachment.first(:order => 'id DESC')
-    news = News.first(:order => 'id DESC')
+    attachment = Attachment.order('id DESC').first
+    news = News.order('id DESC').first
     assert_equal news, attachment.container
   end
 
@@ -116,7 +116,7 @@
     assert_template 'new'
     assert_not_nil assigns(:news)
     assert assigns(:news).new_record?
-    assert_error_tag :content => /title can't be blank/i
+    assert_error_tag :content => /title #{ESCAPED_CANT} be blank/i
   end
 
   def test_get_edit
@@ -144,7 +144,7 @@
           :attachments => {'1' => {'file' => uploaded_test_file('testfile.txt', 'text/plain')}}
       end
     end
-    attachment = Attachment.first(:order => 'id DESC')
+    attachment = Attachment.order('id DESC').first
     assert_equal News.find(1), attachment.container
   end
 
@@ -153,7 +153,7 @@
     put :update, :id => 1, :news => { :description => '' }
     assert_response :success
     assert_template 'edit'
-    assert_error_tag :content => /description can't be blank/i
+    assert_error_tag :content => /description #{ESCAPED_CANT} be blank/i
   end
 
   def test_destroy