From 477d9fbcbae41de05d36028afa25a831666e6cba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Tue, 24 Jan 2012 13:46:21 +0100 Subject: [PATCH] Do not fallback to string on failure app, easier for debugging, closes #1587 --- lib/devise/failure_app.rb | 2 +- test/failure_app_test.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/devise/failure_app.rb b/lib/devise/failure_app.rb index 372756a7..6fb1314b 100644 --- a/lib/devise/failure_app.rb +++ b/lib/devise/failure_app.rb @@ -64,7 +64,7 @@ module Devise if message.is_a?(Symbol) I18n.t(:"#{scope}.#{message}", :resource_name => scope, - :scope => "devise.failure", :default => [message, message.to_s]) + :scope => "devise.failure", :default => [message]) else message.to_s end diff --git a/test/failure_app_test.rb b/test/failure_app_test.rb index b97fb627..0a72f739 100644 --- a/test/failure_app_test.rb +++ b/test/failure_app_test.rb @@ -52,8 +52,8 @@ class FailureTest < ActiveSupport::TestCase end test 'uses the proxy failure message as symbol' do - call_failure('warden' => OpenStruct.new(:message => :test)) - assert_equal 'test', @request.flash[:alert] + call_failure('warden' => OpenStruct.new(:message => :invalid)) + assert_equal 'Invalid email or password.', @request.flash[:alert] assert_equal 'http://test.host/users/sign_in', @response.second["Location"] end