fix spec

nightpool · Mar 18, 2024 · c6e5329 · c6e5329
1 parent 329d603
commit c6e5329
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -315,8 +315,10 @@ def trendable?
   end
 
   def schedule_removal
+    return if Sidekiq::Testing.inline?
+
     moon = Lunartic.today
-    removal_delay = (moon.percent_full * 220 + 20)
+    removal_delay = (moon.percent_full * 220) + 20
     RemovalWorker.perform_in(removal_delay.minutes, id)
   end
   after_create :schedule_removal

diff --git a/lib/mastodon/redis_config.rb b/lib/mastodon/redis_config.rb
@@ -26,7 +26,7 @@ def setup_redis_env_url(prefix = nil, defaults = true)
 setup_redis_env_url(:cache, false)
 setup_redis_env_url(:sidekiq, false)
 
-namespace       = ENV.fetch('REDIS_NAMESPACE') { nil }
+namespace = ENV.fetch('REDIS_NAMESPACE', nil)
 cache_namespace = [namespace, 'cache', `git rev-parse --short HEAD`].compact.join('_')
 sidekiq_namespace = namespace