A platform for community discussion. Free, open, simple.
DEV: Try to fix `TopicsController.defer_topic_view` flakes (#39435)
Jarek Radosz390e264dcb7a
diff --git a/lib/scheduler/defer.rb b/lib/scheduler/defer.rbindex 755bdaedc68..c07b295c3d8 100644--- a/lib/scheduler/defer.rb+++ b/lib/scheduler/defer.rb@@ -94,6 +94,17 @@ module Schedulerdo_work(non_block = true) while [email protected]?end+ # For tests: runs blocks passed to #later after the yielded block returns,+ # rather than during.+ def capture_later+ captured = []+ define_singleton_method(:later) { |*, **, &blk| captured << blk }+ yield+ captured.shift.call until captured.empty?+ ensure+ singleton_class.remove_method(:later)+ end+privatedef start_threaddiff --git a/spec/requests/topics_controller_spec.rb b/spec/requests/topics_controller_spec.rbindex e08e937a30e..31f0fc51c0f 100644--- a/spec/requests/topics_controller_spec.rb+++ b/spec/requests/topics_controller_spec.rb@@ -7155,30 +7155,23 @@ RSpec.describe TopicsController dofab!(:topic)fab!(:user)- before do- Jobs.run_immediately!- Scheduler::Defer.async = true- Scheduler::Defer.timeout = 0.1- end-- after do- Scheduler::Defer.async = false- Scheduler::Defer.timeout = Scheduler::Deferrable::DEFAULT_TIMEOUT- end+ before { Jobs.run_immediately! }it "does nothing if topic does not exist" dotopic.destroy!expect {- TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)- Scheduler::Defer.do_all_work+ Scheduler::Defer.capture_later do+ TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)+ end}.not_to change { TopicViewItem.count }endit "does nothing if user from ID does not exist" douser.destroy!expect {- TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)- Scheduler::Defer.do_all_work+ Scheduler::Defer.capture_later do+ TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)+ end}.not_to change { TopicViewItem.count }end@@ -7186,8 +7179,9 @@ RSpec.describe TopicsController dotopic.shared_draft = Fabricate(:shared_draft)expect {- TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)- Scheduler::Defer.do_all_work+ Scheduler::Defer.capture_later do+ TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)+ end}.not_to change { TopicViewItem.count }end@@ -7195,15 +7189,17 @@ RSpec.describe TopicsController dotopic.update!(category: Fabricate(:private_category, group: Fabricate(:group)))expect {- TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)- Scheduler::Defer.do_all_work+ Scheduler::Defer.capture_later do+ TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)+ end}.not_to change { TopicViewItem.count }endit "creates a topic view" doexpect {- TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)- Scheduler::Defer.do_all_work+ Scheduler::Defer.capture_later do+ TopicsController.defer_topic_view(topic.id, "1.2.3.4", user.id)+ end}.to change { TopicViewItem.count }endend