Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix #2619 - When redis feed is empty, fall back to database (#3721)

Browse source 
* Fix #2619 - When redis feed is empty, fall back to database

* Use redis value to return feed from database only while RegenerationWorker
hasn't finished running

* Fix specs

* Replace usage of reject!
This commit is contained in:
Eugen Rochko 2017-06-14 13:37:03 +02:00 • committed by GitHub
parent 0f52e42c2d
commit dc8a6244fc
4 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
spec/models/feed_spec.rb
View file

@ -2,20 +2,20 @@ require 'rails_helper'
RSpec.describe Feed, type: :model do
describe '#get' do
it "gets statuses with ids in the range, maintining the order from Redis" do
it 'gets statuses with ids in the range, maintining the order from Redis' do
account = Fabricate(:account)
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 = double(zrevrangebyscore: [["val2", 2.0], ["val1", 1.0], ["val3", 3.0], ["deleted", 4.0]])
redis = double(zrevrangebyscore: [['val2', 2.0], ['val1', 1.0], ['val3', 3.0], ['deleted', 4.0]], exists: false)
allow(Redis).to receive(:current).and_return(redis)
feed = Feed.new("type", account)
feed = Feed.new(:home, account)
results = feed.get(3)
expect(results.map(&:id)).to eq [2, 1, 3]
expect(results.first.attributes.keys).to eq ["id", "updated_at"]
expect(results.first.attributes.keys).to eq %w(id updated_at)
end
end
end