diff test/functional/welcome_controller_test.rb @ 1295:622f24f53b42 redmine-2.3

Update to Redmine SVN revision 11972 on 2.3-stable branch

--- a/test/functional/welcome_controller_test.rb	Fri Jun 14 09:01:12 2013 +0100
+++ b/test/functional/welcome_controller_test.rb	Fri Jun 14 09:02:21 2013 +0100
@@ -1,5 +1,5 @@
 # Redmine - project management software
-# Copyright (C) 2006-2012  Jean-Philippe Lang
+# Copyright (C) 2006-2013  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
@@ -16,18 +16,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require File.expand_path('../../test_helper', __FILE__)
-require 'welcome_controller'
-
-# Re-raise errors caught by the controller.
-class WelcomeController; def rescue_action(e) raise e end; end
 
 class WelcomeControllerTest < ActionController::TestCase
   fixtures :projects, :news, :users, :members
 
   def setup
-    @controller = WelcomeController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
     User.current = nil
   end
 
@@ -37,7 +30,7 @@
     assert_template 'index'
     assert_not_nil assigns(:news)
     assert_not_nil assigns(:projects)
-    assert !assigns(:projects).include?(Project.find(:first, :conditions => {:is_public => false}))
+    assert !assigns(:projects).include?(Project.where(:is_public => false).first)
   end
 
   def test_browser_language
@@ -92,6 +85,13 @@
       :content => %r{warnLeavingUnsaved}
   end
 
+  def test_logout_link_should_post
+    @request.session[:user_id] = 2
+
+    get :index
+    assert_select 'a[href=/logout][data-method=post]', :text => 'Sign out'
+  end
+
   def test_call_hook_mixed_in
     assert @controller.respond_to?(:call_hook)
   end