Do not fallback to string on failure app, easier for debugging, closes …

…#1587
heartcombo · Jan 24, 2012 · 477d9fb · 477d9fb
1 parent b885240
commit 477d9fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/devise/failure_app.rb b/lib/devise/failure_app.rb
@@ -64,7 +64,7 @@ def i18n_message(default = nil)
 
       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
@@ -52,8 +52,8 @@ def call_failure(env_params={})
     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