kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Merge pull request #2074 from diminish7/failure_app_test_helper

Browse source 
Test helper was incorrectly returning failure body
This commit is contained in:
José Valim 2012-09-28 07:45:49 -07:00
commit 50338b34f9
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/devise/test_helpers.rb
View file

@ -107,8 +107,8 @@ module Devise
env["warden.options"] = options env["warden.options"] = options
Warden::Manager._run_callbacks(:before_failure, env, options) Warden::Manager._run_callbacks(:before_failure, env, options)
status, headers, body = Devise.warden_config[:failure_app].call(env).to_a status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
@controller.send :render, :status => status, :text => body, @controller.send :render, :status => status, :text => response.body,
:content_type => headers["Content-Type"], :location => headers["Location"] :content_type => headers["Content-Type"], :location => headers["Location"]
nil # causes process return @response nil # causes process return @response
end end

9
test/test_helpers_test.rb
View file

@ -9,7 +9,7 @@ class TestHelpersTest < ActionController::TestCase
self.status = 306 self.status = 306
end end
end end
test "redirects if attempting to access a page unauthenticated" do test "redirects if attempting to access a page unauthenticated" do
get :index get :index
assert_redirected_to new_user_session_path assert_redirected_to new_user_session_path
@ -70,7 +70,7 @@ class TestHelpersTest < ActionController::TestCase
get :index get :index
assert_redirected_to new_user_session_path assert_redirected_to new_user_session_path
end end
test "respects custom failure app" do test "respects custom failure app" do
begin begin
Devise.warden_config.failure_app = CustomFailureApp Devise.warden_config.failure_app = CustomFailureApp
@ -81,6 +81,11 @@ class TestHelpersTest < ActionController::TestCase
end end
end end
test "returns the body of a failure app" do
get :index
assert_equal response.body, "<html><body>You are being <a href=\"http://test.host/users/sign_in\">redirected</a>.</body></html>"
end
test "defined Warden after_authentication callback should not be called when sign_in is called" do test "defined Warden after_authentication callback should not be called when sign_in is called" do
begin begin
Warden::Manager.after_authentication do |user, auth, opts| Warden::Manager.after_authentication do |user, auth, opts|