Restore cached-template integration test

Since template caching is now decided at boot, with_template_caching also
skips the template watcher hook the sandbox registered.

Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
Copilot-Session: f2e356ff-16cd-4517-8e63-a8600747d3fa

Author: joelhawksley

test/sandbox/test/integration_test.rb

@@ -50,15 +50,15 @@ def test_rendering_component_in_a_controller_with_block
     assert_response :success
   end
 
-  def test_template_changes_are_reflected_on_new_request_when_cache_template_loading_is_false
-    with_new_cache do
+  def test_template_changes_are_not_reflected_on_new_request_when_cache_template_loading_is_true
+    with_template_caching do
       get "/controller_inline"
       assert_select("div", "bar")
       assert_response :success
 
       modify_file "app/components/controller_inline_component.html.erb", "<div>Goodbye world!</div>" do
         get "/controller_inline"
-        assert_select("div", "Goodbye world!")
+        assert_select("div", "bar")
         assert_response :success
       end
 
@@ -68,31 +68,22 @@ def test_template_changes_are_reflected_on_new_request_when_cache_template_loadi
     end
   end
 
-  def test_components_are_not_recompiled_on_new_request_when_no_template_changed
+  def test_template_changes_are_reflected_on_new_request_when_cache_template_loading_is_false
     with_new_cache do
       get "/controller_inline"
-      MyComponent.__vc_compile
-
-      get "/controller_inline"
+      assert_select("div", "bar")
       assert_response :success
-      assert MyComponent.__vc_compiled?
-    end
-  end
-
-  def test_components_are_recompiled_on_new_request_when_a_template_is_added
-    new_template = Rails.root.join("app/components/added_template_component.html.erb")
 
-    with_new_cache do
-      get "/controller_inline"
-      MyComponent.__vc_compile
+      modify_file "app/components/controller_inline_component.html.erb", "<div>Goodbye world!</div>" do
+        get "/controller_inline"
+        assert_select("div", "Goodbye world!")
+        assert_response :success
+      end
 
-      File.write(new_template, "<div>Added</div>")
       get "/controller_inline"
+      assert_select("div", "bar")
       assert_response :success
-      refute MyComponent.__vc_compiled?
     end
-  ensure
-    FileUtils.rm_f(new_template)
   end
 
   def test_inherited_template_changes_are_reflected_on_new_request_when_cache_template_loading_is_false

test/test_helper.rb

@@ -128,13 +128,22 @@ def with_generate_sidecar(enabled, &block)
   with_generate_option(:sidecar, enabled, &block)
 end
 
+# Template caching is decided at boot, so also skip the template watcher that
+# the sandbox registered because it boots without template caching.
 def with_template_caching
+  executor = Rails.application.executor
+  watcher_hook = executor._run_callbacks.find do |callback|
+    callback.filter.is_a?(Proc) && callback.filter.source_location&.first&.end_with?("view_component/compile_cache.rb")
+  end&.filter
+  executor.skip_callback(:run, :before, watcher_hook) if watcher_hook
+
   old_cache_template_loading = ActionView::Base.cache_template_loading
   ActionView::Base.cache_template_loading = true
 
   yield
 ensure
   ActionView::Base.cache_template_loading = old_cache_template_loading
+  executor.set_callback(:run, :before, watcher_hook) if watcher_hook
 end
 
 def with_new_cache