about summary refs log tree commit diff
path: root/spec/models
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-06-14 13:37:03 +0200
committerGitHub <noreply@github.com>2017-06-14 13:37:03 +0200
commitdc8a6244fcfd541239c1023b3c6103f70b8276c8 (patch)
treefc5ce20f181c45d5b7f59d731029a63830718752 /spec/models
parent0f52e42c2d075670b67e9f888ef65eca0e94684c (diff)
Fix #2619 - When redis feed is empty, fall back to database (#3721)
* 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!
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/feed_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb
index 96c477073..15033e9eb 100644
--- a/spec/models/feed_spec.rb
+++ b/spec/models/feed_spec.rb
@@ -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