From bba537a7bebe11be4b1e4a7e126a34cd27b73678 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Sun, 7 May 2017 21:32:52 -0400 Subject: Improve allowed language handling (#2897) * Dont allow empty value in user allowed languages * Sanitize language input to reject blank values in array --- spec/models/status_spec.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'spec/models/status_spec.rb') diff --git a/spec/models/status_spec.rb b/spec/models/status_spec.rb index 0c0b16829..721951030 100644 --- a/spec/models/status_spec.rb +++ b/spec/models/status_spec.rb @@ -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') -- cgit