diff options
| -rw-r--r-- | app/services/precompute_feed_service.rb | 2 | ||||
| -rw-r--r-- | spec/models/feed_spec.rb | 6 | ||||
| -rw-r--r-- | spec/rails_helper.rb | 6 | ||||
| -rw-r--r-- | spec/services/precompute_feed_service_spec.rb | 8 | ||||
| -rw-r--r-- | spec/workers/scheduler/feed_cleanup_scheduler_spec.rb | 7 |
5 files changed, 19 insertions, 10 deletions
diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb index 83765bb05..4c24567c8 100644 --- a/app/services/precompute_feed_service.rb +++ b/app/services/precompute_feed_service.rb @@ -14,7 +14,7 @@ class PrecomputeFeedService < BaseService def populate_feed redis.pipelined do - statuses.each do |status| + statuses.reverse_each do |status| process_status(status) end diff --git a/spec/models/feed_spec.rb b/spec/models/feed_spec.rb index 15033e9eb..1cdb3a783 100644 --- a/spec/models/feed_spec.rb +++ b/spec/models/feed_spec.rb @@ -8,13 +8,13 @@ RSpec.describe Feed, type: :model do 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]], exists: false) - allow(Redis).to receive(:current).and_return(redis) + Redis.current.zadd(FeedManager.instance.key(:home, account.id), + [[4, 'deleted'], [3, 'val3'], [2, 'val2'], [1, 'val1']]) feed = Feed.new(:home, account) results = feed.get(3) - expect(results.map(&:id)).to eq [2, 1, 3] + expect(results.map(&:id)).to eq [3, 2] expect(results.first.attributes.keys).to eq %w(id updated_at) end end diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index cfc9eec9e..9a4c8fd3c 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -13,6 +13,7 @@ Dir[Rails.root.join('spec/support/**/*.rb')].each { |f| require f } ActiveRecord::Migration.maintain_test_schema! WebMock.disable_net_connect! +Redis.current = Redis::Namespace.new("mastodon_test#{ENV['TEST_ENV_NUMBER']}", redis: Redis.current) Sidekiq::Testing.inline! Sidekiq::Logging.logger = nil @@ -43,6 +44,11 @@ RSpec.configure do |config| https = ENV['LOCAL_HTTPS'] == 'true' Capybara.app_host = "http#{https ? 's' : ''}://#{ENV.fetch('LOCAL_DOMAIN')}" end + + config.after :each do + keys = Redis.current.keys + Redis.current.del(keys) if keys.any? + end end RSpec::Sidekiq.configure do |config| diff --git a/spec/services/precompute_feed_service_spec.rb b/spec/services/precompute_feed_service_spec.rb index 9f56b0256..72235a966 100644 --- a/spec/services/precompute_feed_service_spec.rb +++ b/spec/services/precompute_feed_service_spec.rb @@ -11,12 +11,12 @@ RSpec.describe PrecomputeFeedService do account = Fabricate(:account) followed_account = Fabricate(:account) Fabricate(:follow, account: account, target_account: followed_account) - status = Fabricate(:status, account: followed_account) - - expected_redis_args = FeedManager.instance.key(:home, account.id), status.id, status.id - expect_any_instance_of(Redis).to receive(:zadd).with(*expected_redis_args) + reblog = Fabricate(:status, account: followed_account) + status = Fabricate(:status, account: account, reblog: reblog) subject.call(account) + + expect(Redis.current.zscore(FeedManager.instance.key(:home, account.id), reblog.id)).to eq status.id end end end diff --git a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb index 4c709a2c9..b8487b03f 100644 --- a/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb +++ b/spec/workers/scheduler/feed_cleanup_scheduler_spec.rb @@ -7,10 +7,13 @@ describe Scheduler::FeedCleanupScheduler do let!(:inactive_user) { Fabricate(:user, current_sign_in_at: 22.days.ago) } it 'clears feeds of inactives' do - expect_any_instance_of(Redis).to receive(:del).with(feed_key_for(inactive_user)) - expect_any_instance_of(Redis).not_to receive(:del).with(feed_key_for(active_user)) + Redis.current.zadd(feed_key_for(inactive_user), 1, 1) + Redis.current.zadd(feed_key_for(active_user), 1, 1) subject.perform + + expect(Redis.current.zcard(feed_key_for(inactive_user))).to eq 0 + expect(Redis.current.zcard(feed_key_for(active_user))).to eq 1 end def feed_key_for(user) |