From 9317ec8eb185659b687dec2ba84c3f7463d7b61d Mon Sep 17 00:00:00 2001 From: alpaca-tc Date: Tue, 25 Apr 2017 22:06:41 +0900 Subject: Localize with i18n for Devise::FailureApp (#2309) This PR fixes I18n.locale for rake middlewares. Mastodon uses Devise that depends on Warden. Warden::Manager can be found in rake middleware. It is outside of the controller. In the case of authentication failed, warden calls throw(:warden). At the time Warden::Manager delegates request to failure_app to generate response and flash[:alert] after catching it. Unfortunately, I18n.locale is already reset then because I18n.with_locale is enabled only inside the controller. If we used I18n.locale=, Devise::FailureApp could get the current locale. --- spec/controllers/auth/sessions_controller_spec.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'spec') diff --git a/spec/controllers/auth/sessions_controller_spec.rb b/spec/controllers/auth/sessions_controller_spec.rb index 0ec0b8f2f..2b68b4c5a 100644 --- a/spec/controllers/auth/sessions_controller_spec.rb +++ b/spec/controllers/auth/sessions_controller_spec.rb @@ -49,6 +49,20 @@ RSpec.describe Auth::SessionsController, type: :controller do expect(controller.current_user).to be_nil end end + + context 'using an unconfirmed password' do + before do + request.headers['Accept-Language'] = accept_language + post :create, params: { user: { email: unconfirmed_user.email, password: unconfirmed_user.password } } + end + + let(:unconfirmed_user) { user.tap { |u| u.update!(confirmed_at: nil) } } + let(:accept_language) { 'fr' } + + it 'shows a translated login error' do + expect(flash[:alert]).to eq(I18n.t('devise.failure.unconfirmed', locale: accept_language)) + end + end end context 'using two-factor authentication' do -- cgit