Merge remote-tracking branch 'origin/master' into gs-master

4 files changed, 59 insertions, 13 deletions

diff --git a/spec/controllers/concerns/user_tracking_concern_spec.rb b/spec/controllers/concerns/user_tracking_concern_spec.rb
index 6bd29f887..168d44ba6 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/lib/activitypub/activity/undo_spec.rb b/spec/lib/activitypub/activity/undo_spec.rb
index 14c68efe5..e01c5e03e 100644
--- a/spec/lib/activitypub/activity/undo_spec.rb
+++ b/spec/lib/activitypub/activity/undo_spec.rb
@@ -25,16 +25,30 @@ RSpec.describe ActivityPub::Activity::Undo do
           type: 'Announce',
           actor: ActivityPub::TagManager.instance.uri_for(sender),
           object: ActivityPub::TagManager.instance.uri_for(status),
+          atomUri: 'barbar',
         }
       end
 
-      before do
-        Fabricate(:status, reblog: status, account: sender, uri: 'bar')
+      context do
+        before do
+          Fabricate(:status, reblog: status, account: sender, uri: 'bar')
+        end
+
+        it 'deletes the reblog' do
+          subject.perform
+          expect(sender.reblogged?(status)).to be false
+        end
       end
 
-      it 'deletes the reblog' do
-        subject.perform
-        expect(sender.reblogged?(status)).to be false
+      context 'with atomUri' do
+        before do
+          Fabricate(:status, reblog: status, account: sender, uri: 'barbar')
+        end
+
+        it 'deletes the reblog by atomUri' do
+          subject.perform
+          expect(sender.reblogged?(status)).to be false
+        end
       end
     end
 
diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb
index 5433f44bd..8719369db 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
+
+    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
diff --git a/spec/services/reblog_service_spec.rb b/spec/services/reblog_service_spec.rb
index 0ad5c5f6b..19d3bb6cb 100644
--- a/spec/services/reblog_service_spec.rb
+++ b/spec/services/reblog_service_spec.rb
@@ -39,6 +39,12 @@ RSpec.describe ReblogService do
       expect(status.reblogs.count).to eq 1
     end
 
+    describe 'after_create_commit :store_uri' do
+      it 'keeps consistent reblog count' do
+        expect(status.reblogs.count).to eq 1
+      end
+    end
+
     it 'distributes to followers' do
       expect(ActivityPub::DistributionWorker).to have_received(:perform_async)
     end