From 3283868e28794d7abe217c525aadf5e7b9e2fa66 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Fri, 13 Oct 2017 11:00:11 +0200 Subject: [PATCH] Improve spec of Feed and UserTrackingConcern (#5367) --- .../concerns/user_tracking_concern_spec.rb | 2 + spec/models/feed_spec.rb | 40 +++++++++++++++---- 2 files changed, 34 insertions(+), 8 deletions(-) diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb index 6bd29f8870..168d44ba6d 100644 --- a/spec/controllers/concerns/user_tracking_concern_spec.rb +++ b/spec/controllers/concerns/user_tracking_concern_spec.rb @@ -5,6 +5,7 @@ require 'rails_helper' describe ApplicationController, type: :controller do controller do include UserTrackingConcern + def show render plain: 'show' end @@ -49,6 +50,7 @@ describe ApplicationController, type: :controller do get :show expect_updated_sign_in_at(user) + expect(Redis.current.get("account:#{user.account_id}:regeneration")).to eq 'true' expect(RegenerationWorker).to have_received(:perform_async) end diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb index 5433f44bd8..8719369db5 100644 --- a/spec/models/feed_spec.rb +++ b/spec/models/feed_spec.rb @@ -1,21 +1,45 @@ require 'rails_helper' RSpec.describe Feed, type: :model do + let(:account) { Fabricate(:account) } + + subject { described_class.new(:home, account) } + describe '#get' do - it 'gets statuses with ids in the range' do - account = Fabricate(:account) + before do Fabricate(:status, account: account, id: 1) Fabricate(:status, account: account, id: 2) Fabricate(:status, account: account, id: 3) Fabricate(:status, account: account, id: 10) - Redis.current.zadd(FeedManager.instance.key(:home, account.id), - [[4, 4], [3, 3], [2, 2], [1, 1]]) + end - feed = Feed.new(:home, account) - results = feed.get(3) + context 'when feed is generated' do + before do + Redis.current.zadd( + FeedManager.instance.key(:home, account.id), + [[4, 4], [3, 3], [2, 2], [1, 1]] + ) + end - expect(results.map(&:id)).to eq [3, 2] - expect(results.first.attributes.keys).to eq %w(id updated_at) + it 'gets statuses with ids in the range from redis' do + results = subject.get(3) + + expect(results.map(&:id)).to eq [3, 2] + expect(results.first.attributes.keys).to eq %w(id updated_at) + end + end + + context 'when feed is being generated' do + before do + Redis.current.set("account:#{account.id}:regeneration", true) + end + + it 'gets statuses with ids in the range from database' do + results = subject.get(3) + + expect(results.map(&:id)).to eq [10, 3, 2] + expect(results.first.attributes.keys).to include('id', 'updated_at') + end end end end