Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-17 16:17:10 +00:00
parent 60ff086960 fbe7756da6
commit aa2bf07281
51 changed files with 926 additions and 447 deletions
--- a/spec/services/precompute_feed_service_spec.rb
+++ b/spec/services/precompute_feed_service_spec.rb
@@ -16,7 +16,7 @@ RSpec.describe PrecomputeFeedService do

      subject.call(account)

-      expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq status.id.to_f
+      expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to be_within(0.1).of(status.id.to_f)
    end

    it 'does not raise an error even if it could not find any status' do