From d87ee1167e0f11d94a20e70e9228a3398e202bc8 Mon Sep 17 00:00:00 2001 From: saturday06 Date: Mon, 17 Apr 2017 17:29:08 +0900 Subject: [PATCH] Assign user locale on signup (#1982) --- app/controllers/auth/registrations_controller.rb | 1 + spec/controllers/auth/registrations_controller_spec.rb | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/controllers/auth/registrations_controller.rb b/app/controllers/auth/registrations_controller.rb index f8050afb5c..dd30be32a4 100644 --- a/app/controllers/auth/registrations_controller.rb +++ b/app/controllers/auth/registrations_controller.rb @@ -10,6 +10,7 @@ class Auth::RegistrationsController < Devise::RegistrationsController def build_resource(hash = nil) super(hash) + resource.locale = I18n.locale resource.build_account if resource.account.nil? end diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb index 6b26e66931..c2141766eb 100644 --- a/spec/controllers/auth/registrations_controller_spec.rb +++ b/spec/controllers/auth/registrations_controller_spec.rb @@ -16,9 +16,12 @@ RSpec.describe Auth::RegistrationsController, type: :controller do end describe 'POST #create' do + let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s } + before do Setting.open_registrations = true request.env["devise.mapping"] = Devise.mappings[:user] + request.headers["Accept-Language"] = accept_language post :create, params: { user: { account_attributes: { username: 'test' }, email: 'test@example.com', password: '12345678', password_confirmation: '12345678' } } end @@ -27,7 +30,9 @@ RSpec.describe Auth::RegistrationsController, type: :controller do end it 'creates user' do - expect(User.find_by(email: 'test@example.com')).to_not be_nil + user = User.find_by(email: 'test@example.com') + expect(user).to_not be_nil + expect(user.locale).to eq(accept_language) end end end