Fix Broadcastable inclusion in new Rails apps

hotwired · Sep 18, 2024 · a38445e · a38445e
1 parent fa4b60a
commit a38445e
Show file tree

Hide file tree

Showing 2 changed files with 220 additions and 226 deletions.
diff --git a/lib/turbo/engine.rb b/lib/turbo/engine.rb
@@ -92,8 +92,8 @@ class Engine < Rails::Engine
     end
 
     initializer "turbo.broadcastable" do
-      ActiveSupport.on_load(:active_job) do
-        ActiveSupport.on_load(:active_record) do
+      ActiveSupport.on_load(:active_record) do
+        if defined?(ActiveJob)
           include Turbo::Broadcastable
         end
       end
@@ -123,9 +123,9 @@ class Engine < Rails::Engine
         include Turbo::TestAssertions
       end
 
-      ActiveSupport.on_load(:active_job) do
-        ActiveSupport.on_load(:action_cable) do
-          ActiveSupport.on_load(:active_support_test_case) do
+      ActiveSupport.on_load(:action_cable) do
+        ActiveSupport.on_load(:active_support_test_case) do
+          if defined?(ActiveJob)
             require "turbo/broadcastable/test_helper"
             include Turbo::Broadcastable::TestHelper
           end