Move cached-template integration test to isolated tests

Booting a production app tests template caching as decided at boot, so
the sandbox no longer needs to fake it by skipping the watcher hook.
Remove the now-unused with_template_caching helper.

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

Author: joelhawksley

test/isolated/template_caching_test.rb

@@ -3,6 +3,7 @@
 require "bundler/setup"
 require "minitest/autorun"
 require "minitest/mock"
+require "tmpdir"
 require "rails"
 require "action_controller/railtie"
 require "active_support/testing/isolation"
@@ -42,17 +43,41 @@ def test_executor_does_nothing_when_templates_are_cached
     assert_equal 0, reads
   end
 
+  def test_template_changes_are_not_reflected_on_new_request_when_templates_are_cached
+    Dir.mktmpdir do |root|
+      write_file(root, "app/components/greeting_component.rb", "class GreetingComponent < ViewComponent::Base; end")
+      write_file(root, "app/components/greeting_component.html.erb", "<div>Hello</div>")
+
+      app = boot_app("production", root: root)
+      app.routes.draw do
+        get "/", to: ->(_env) { [200, {"content-type" => "text/html"}, [ActionController::Base.render(GreetingComponent.new)]] }
+      end
+      request = Rack::MockRequest.new(app)
+
+      assert_equal "<div>Hello</div>", request.get("/").body.strip
+
+      write_file(root, "app/components/greeting_component.html.erb", "<div>Goodbye</div>")
+
+      assert_equal "<div>Hello</div>", request.get("/").body.strip
+    end
+  end
+
   private
 
-  def boot_app(env)
+  def boot_app(env, root: __dir__)
     Rails.env = env
 
     Class.new(Rails::Application) do
-      config.root = __dir__
+      config.root = root
       config.eager_load = env == "production"
       config.enable_reloading = env == "development"
       config.secret_key_base = "test"
       config.logger = Logger.new(nil)
     end.tap(&:initialize!)
   end
+
+  def write_file(root, path, content)
+    FileUtils.mkdir_p(File.dirname(File.join(root, path)))
+    File.write(File.join(root, path), content)
+  end
 end

test/sandbox/test/integration_test.rb

@@ -50,24 +50,6 @@ def test_rendering_component_in_a_controller_with_block
     assert_response :success
   end
 
-  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", "bar")
-        assert_response :success
-      end
-
-      get "/controller_inline"
-      assert_select("div", "bar")
-      assert_response :success
-    end
-  end
-
   def test_template_changes_are_reflected_on_new_request_when_cache_template_loading_is_false
     with_new_cache do
       get "/controller_inline"

test/test_helper.rb

@@ -128,24 +128,6 @@ 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/engine.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
   old_cache = ViewComponent::CompileCache.cache
   ViewComponent::CompileCache.cache = Set.new