Improve spec of Feed and UserTrackingConcern (#5367)

diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index 6bd29f8870c83ca61540f09201736a9de854f4c8..168d44ba6d939d9d6e48a257644be82a2e877f29 100644 (file)
--- 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 5433f44bd83aecae85f662150a988c474109d869..8719369db5bd61dc59631ca9dead5cfafce33d8e 100644 (file)
--- 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
+
+    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
+
+      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
 
-      feed = Feed.new(:home, account)
-      results = feed.get(3)
+      it 'gets statuses with ids in the range from database' do
+        results = subject.get(3)
 
-      expect(results.map(&:id)).to eq [3, 2]
-      expect(results.first.attributes.keys).to eq %w(id updated_at)
+        expect(results.map(&:id)).to eq [10, 3, 2]
+        expect(results.first.attributes.keys).to include('id', 'updated_at')
+      end
     end
   end
 end