Improve allowed language handling (#2897)

* Dont allow empty value in user allowed languages

* Sanitize language input to reject blank values in array
This commit is contained in:
Matt Jankowski
2017-05-07 21:32:52 -04:00
committed by Eugen Rochko
parent 0291b73de7
commit bba537a7be
4 changed files with 27 additions and 1 deletions

View File

@ -18,7 +18,7 @@ describe Settings::PreferencesController do
describe 'PUT #update' do
it 'updates the user record' do
put :update, params: { user: { locale: 'en', allowed_languages: ['es', 'fr'] } }
put :update, params: { user: { locale: 'en', allowed_languages: ['es', 'fr', ''] } }
expect(response).to redirect_to(settings_preferences_path)
user.reload

View File

@ -265,6 +265,18 @@ RSpec.describe Status, type: :model do
expect(results).not_to include(fr_status)
end
it 'includes all languages when user does not have a setting' do
user = Fabricate(:user, allowed_languages: [])
@account.update(user: user)
en_status = Fabricate(:status, language: 'en')
es_status = Fabricate(:status, language: 'es')
results = Status.as_public_timeline(@account)
expect(results).to include(en_status)
expect(results).to include(es_status)
end
it 'includes all languages when account does not have a user' do
expect(@account.user).to be_nil
en_status = Fabricate(:status, language: 'en')

View File

@ -22,6 +22,12 @@ RSpec.describe User, type: :model do
user.valid?
expect(user).to model_have_error_on_field(:email)
end
it 'cleans out empty string from languages' do
user = Fabricate.build(:user, allowed_languages: [''])
user.valid?
expect(user.allowed_languages).to eq []
end
end
describe 'settings' do