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

Merge from live branch

--- a/test/functional/issue_statuses_controller_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/functional/issue_statuses_controller_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,17 +1,26 @@
+# Redmine - project management software
+# 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
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
 require File.expand_path('../../test_helper', __FILE__)
-require 'issue_statuses_controller'
-
-# Re-raise errors caught by the controller.
-class IssueStatusesController; def rescue_action(e) raise e end; end
-
 
 class IssueStatusesControllerTest < ActionController::TestCase
   fixtures :issue_statuses, :issues, :users
 
   def setup
-    @controller = IssueStatusesController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     User.current = nil
     @request.session[:user_id] = 1 # admin
   end
@@ -45,7 +54,7 @@
       post :create, :issue_status => {:name => 'New status'}
     end
     assert_redirected_to :action => 'index'
-    status = IssueStatus.find(:first, :order => 'id DESC')
+    status = IssueStatus.order('id DESC').first
     assert_equal 'New status', status.name
   end
 
@@ -53,7 +62,7 @@
     post :create, :issue_status => {:name => ''}
     assert_response :success
     assert_template 'new'
-    assert_error_tag :content => /name can&#x27;t be blank/i
+    assert_error_tag :content => /name #{ESCAPED_CANT} be blank/i
   end
 
   def test_edit
@@ -73,7 +82,7 @@
     put :update, :id => '3', :issue_status => {:name => ''}
     assert_response :success
     assert_template 'edit'
-    assert_error_tag :content => /name can&#x27;t be blank/i
+    assert_error_tag :content => /name #{ESCAPED_CANT} be blank/i
   end
 
   def test_destroy