Permalink
Browse files

Merge pull request #2074 from diminish7/failure_app_test_helper

Test helper was incorrectly returning failure body
  • Loading branch information...
2 parents 75268be + b274910 commit 50338b34f90973bc551a4cad561e8f59bffb118c @josevalim josevalim committed Sep 28, 2012
Showing with 9 additions and 4 deletions.
  1. +2 −2 lib/devise/test_helpers.rb
  2. +7 −2 test/test_helpers_test.rb
@@ -107,8 +107,8 @@ def _process_unauthenticated(env, options = {})
env["warden.options"] = options
Warden::Manager._run_callbacks(:before_failure, env, options)
- status, headers, body = Devise.warden_config[:failure_app].call(env).to_a
- @controller.send :render, :status => status, :text => body,
+ status, headers, response = Devise.warden_config[:failure_app].call(env).to_a
+ @controller.send :render, :status => status, :text => response.body,
:content_type => headers["Content-Type"], :location => headers["Location"]
nil # causes process return @response
end
@@ -9,7 +9,7 @@ def redirect
self.status = 306
end
end
-
+
test "redirects if attempting to access a page unauthenticated" do
get :index
assert_redirected_to new_user_session_path
@@ -70,7 +70,7 @@ def redirect
get :index
assert_redirected_to new_user_session_path
end
-
+
test "respects custom failure app" do
begin
Devise.warden_config.failure_app = CustomFailureApp
@@ -81,6 +81,11 @@ def redirect
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
begin
Warden::Manager.after_authentication do |user, auth, opts|

0 comments on commit 50338b3

Please sign in to comment.