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

2017-10-16 01:29:02 -05:00
parent f72ad67a39 894da3dcca
commit 6cd5b3bbe5
60 changed files with 738 additions and 319 deletions
--- 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