Merge branch 'glitch' into main

2 files changed, 7 insertions, 3 deletions

diff --git a/spec/controllers/auth/registrations_controller_spec.rb b/spec/controllers/auth/registrations_controller_spec.rb
index bef822763..c701a3b8b 100644
--- a/spec/controllers/auth/registrations_controller_spec.rb
+++ b/spec/controllers/auth/registrations_controller_spec.rb
@@ -82,6 +82,10 @@ RSpec.describe Auth::RegistrationsController, type: :controller do
   describe 'POST #create' do
     let(:accept_language) { Rails.application.config.i18n.available_locales.sample.to_s }
 
+    before do
+      session[:registration_form_time] = 5.seconds.ago
+    end
+
     around do |example|
       current_locale = I18n.locale
       example.run
diff --git a/spec/lib/feed_manager_spec.rb b/spec/lib/feed_manager_spec.rb
index 78563ee94..2217ad272 100644
--- a/spec/lib/feed_manager_spec.rb
+++ b/spec/lib/feed_manager_spec.rb
@@ -342,7 +342,7 @@ RSpec.describe FeedManager do
 
     context 'when replies policy is set to no replies' do
       before do
-        list.replies_policy = :no_replies
+        list.replies_policy = :none
       end
 
       it 'pushes statuses that are not replies' do
@@ -365,7 +365,7 @@ RSpec.describe FeedManager do
 
     context 'when replies policy is set to list-only replies' do
       before do
-        list.replies_policy = :list_replies
+        list.replies_policy = :list
       end
 
       it 'pushes statuses that are not replies' do
@@ -394,7 +394,7 @@ RSpec.describe FeedManager do
 
     context 'when replies policy is set to any reply' do
       before do
-        list.replies_policy = :all_replies
+        list.replies_policy = :followed
       end
 
       it 'pushes statuses that are not replies' do