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

Merge from live branch

--- a/test/functional/search_controller_test.rb	Mon Mar 17 08:57:04 2014 +0000
+++ b/test/functional/search_controller_test.rb	Thu Sep 11 12:46:20 2014 +0100
@@ -1,8 +1,21 @@
+# 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 'search_controller'
-
-# Re-raise errors caught by the controller.
-class SearchController; def rescue_action(e) raise e end; end
 
 class SearchControllerTest < ActionController::TestCase
   fixtures :projects, :enabled_modules, :roles, :users, :members, :member_roles,
@@ -11,9 +24,6 @@
            :repositories, :changesets
 
   def setup
-    @controller = SearchController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     User.current = nil
   end
 
@@ -180,8 +190,7 @@
   end
 
   def test_search_content
-    Issue.update_all("description = 'This is a searchkeywordinthecontent'", "id=1")
-
+    Issue.where(:id => 1).update_all("description = 'This is a searchkeywordinthecontent'")
     get :index, :id => 1, :q => 'searchkeywordinthecontent', :titles_only => ''
     assert_equal false, assigns(:titles_only)
     results = assigns(:results)