Improve spec of Feed and UserTrackingConcern (#5367)

This commit is contained in:
Eugen Rochko 2017-10-13 11:00:11 +02:00 committed by GitHub
parent dc91fd482a
commit 3283868e28
2 changed files with 34 additions and 8 deletions

View File

@ -5,6 +5,7 @@ require 'rails_helper'
describe ApplicationController, type: :controller do describe ApplicationController, type: :controller do
controller do controller do
include UserTrackingConcern include UserTrackingConcern
def show def show
render plain: 'show' render plain: 'show'
end end
@ -49,6 +50,7 @@ describe ApplicationController, type: :controller do
get :show get :show
expect_updated_sign_in_at(user) 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) expect(RegenerationWorker).to have_received(:perform_async)
end end

View File

@ -1,21 +1,45 @@
require 'rails_helper' require 'rails_helper'
RSpec.describe Feed, type: :model do RSpec.describe Feed, type: :model do
let(:account) { Fabricate(:account) }
subject { described_class.new(:home, account) }
describe '#get' do describe '#get' do
it 'gets statuses with ids in the range' do before do
account = Fabricate(:account)
Fabricate(:status, account: account, id: 1) Fabricate(:status, account: account, id: 1)
Fabricate(:status, account: account, id: 2) Fabricate(:status, account: account, id: 2)
Fabricate(:status, account: account, id: 3) Fabricate(:status, account: account, id: 3)
Fabricate(:status, account: account, id: 10) Fabricate(:status, account: account, id: 10)
Redis.current.zadd(FeedManager.instance.key(:home, account.id), end
[[4, 4], [3, 3], [2, 2], [1, 1]])
feed = Feed.new(:home, account) context 'when feed is generated' do
results = feed.get(3) before do
Redis.current.zadd(
FeedManager.instance.key(:home, account.id),
[[4, 4], [3, 3], [2, 2], [1, 1]]
)
end
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.map(&:id)).to eq [3, 2]
expect(results.first.attributes.keys).to eq %w(id updated_at) expect(results.first.attributes.keys).to eq %w(id updated_at)
end end
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 end