diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2022-01-28 08:58:32 +0100 |
commit | b2915613fb247597d3de2f80c2c007b3369ac5bb (patch) | |
tree | 745c245cb4c2d16dcada37d1fb1cf5b13f4e2493 /spec/models/public_feed_spec.rb | |
parent | ad6ddb9bdd3ceae3f9d5dde7b351081f0dfa2a9a (diff) | |
parent | e38fc319dc6897ca867a509b0c7a5878d34d0f00 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `Gemfile.lock`: Upstream-updated lib textually too close to glitch-soc-only dep. Updated like upstream.
Diffstat (limited to 'spec/models/public_feed_spec.rb')
-rw-r--r-- | spec/models/public_feed_spec.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/models/public_feed_spec.rb b/spec/models/public_feed_spec.rb index c251953a4..23cc3ceea 100644 --- a/spec/models/public_feed_spec.rb +++ b/spec/models/public_feed_spec.rb @@ -31,7 +31,6 @@ RSpec.describe PublicFeed, type: :model do end it 'filters out silenced accounts' do - account = Fabricate(:account) silenced_account = Fabricate(:account, silenced: true) status = Fabricate(:status, account: account) silenced_status = Fabricate(:status, account: silenced_account) @@ -238,8 +237,7 @@ RSpec.describe PublicFeed, type: :model do context 'with language preferences' do it 'excludes statuses in languages not allowed by the account user' do - user = Fabricate(:user, chosen_languages: [:en, :es]) - @account.update(user: user) + @account.user.update(chosen_languages: [:en, :es]) en_status = Fabricate(:status, language: 'en') es_status = Fabricate(:status, language: 'es') fr_status = Fabricate(:status, language: 'fr') @@ -250,8 +248,7 @@ RSpec.describe PublicFeed, type: :model do end it 'includes all languages when user does not have a setting' do - user = Fabricate(:user, chosen_languages: nil) - @account.update(user: user) + @account.user.update(chosen_languages: nil) en_status = Fabricate(:status, language: 'en') es_status = Fabricate(:status, language: 'es') @@ -261,7 +258,8 @@ RSpec.describe PublicFeed, type: :model do end it 'includes all languages when account does not have a user' do - expect(@account.user).to be_nil + @account.update(user: nil) + en_status = Fabricate(:status, language: 'en') es_status = Fabricate(:status, language: 'es') |