From f025cc67827a5b1b1faf10dec9d5a1e14e67fa5f Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 1 May 2017 11:42:13 -0400 Subject: Filter on allowed user language preferences (#2361) * Naive approached to timeline filtering * Convert allowed_languages into a db column * Allow users to choose languages to see statuses in * Style list items as two columns * Add a hint to explain language filtering preference --- spec/controllers/settings/preferences_controller_spec.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'spec/controllers') diff --git a/spec/controllers/settings/preferences_controller_spec.rb b/spec/controllers/settings/preferences_controller_spec.rb index 92b626d2d..432e35cd4 100644 --- a/spec/controllers/settings/preferences_controller_spec.rb +++ b/spec/controllers/settings/preferences_controller_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' describe Settings::PreferencesController do render_views - let(:user) { Fabricate(:user) } + let(:user) { Fabricate(:user, allowed_languages: []) } before do sign_in user, scope: :user @@ -18,10 +18,12 @@ describe Settings::PreferencesController do describe 'PUT #update' do it 'updates the user record' do - put :update, params: { user: { locale: 'en' } } + put :update, params: { user: { locale: 'en', allowed_languages: ['es', 'fr'] } } expect(response).to redirect_to(settings_preferences_path) - expect(user.reload.locale).to eq 'en' + user.reload + expect(user.locale).to eq 'en' + expect(user.allowed_languages).to eq ['es', 'fr'] end it 'updates user settings' do -- cgit