Merge remote-tracking branch 'upstream/pull/2495'

diff --combined test/controllers/users_controller_test.rb
index c40c30b28a986f1ce794edb57700256035c31e4b,5097c42fb515ce64e1626cf57eb1e058f03da185..f8d5a431c11db07b31ee5cf796f6db79a3d9dbd6
--- 1/test/controllers/users_controller_test.rb
--- 2/test/controllers/users_controller_test.rb
+++ b/test/controllers/users_controller_test.rb
@@@ -1,12 -1,6 +1,6 @@@
  require "test_helper"
  
  class UsersControllerTest < ActionController::TestCase
-   def setup
-     super
- 
-     stub_hostip_requests
-   end
- 
    ##
    # test all routes which lead to this controller
    def test_routes
@@@ -344,29 -338,29 +338,29 @@@
    end
  
    def test_logout_without_referer
 +    post :logout
 +    assert_response :redirect
 +    assert_redirected_to root_path
 +  end
 +
 +  def test_logout_with_referer
 +    post :logout, :params => { :referer => "/test" }
 +    assert_response :redirect
 +    assert_redirected_to "/test"
 +  end
 +
 +  def test_logout_fallback_without_referer
      get :logout
      assert_response :success
      assert_template :logout
      assert_select "input[name=referer][value=?]", ""
 -
 -    session_id = assert_select("input[name=session]").first["value"]
 -
 -    get :logout, :params => { :session => session_id }
 -    assert_response :redirect
 -    assert_redirected_to root_path
    end
  
 -  def test_logout_with_referer
 +  def test_logout_fallback_with_referer
      get :logout, :params => { :referer => "/test" }
      assert_response :success
      assert_template :logout
      assert_select "input[name=referer][value=?]", "/test"
 -
 -    session_id = assert_select("input[name=session]").first["value"]
 -
 -    get :logout, :params => { :session => session_id, :referer => "/test" }
 -    assert_response :redirect
 -    assert_redirected_to "/test"
    end
  
    def test_logout_with_token
@@@ -374,7 -368,16 +368,7 @@@
  
      session[:token] = token.token
  
 -    get :logout
 -    assert_response :success
 -    assert_template :logout
 -    assert_select "input[name=referer][value=?]", ""
 -    assert_equal token.token, session[:token]
 -    assert_not_nil UserToken.where(:id => token.id).first
 -
 -    session_id = assert_select("input[name=session]").first["value"]
 -
 -    get :logout, :params => { :session => session_id }
 +    post :logout
      assert_response :redirect
      assert_redirected_to root_path
      assert_nil session[:token]