Merge pull request #23807 from matthewd/executor

Publish AS::Executor and AS::Reloader APIs

1 files changed, 11 insertions, 2 deletions

diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb
index f4534b4173..e871ddd289 100644
--- a/actionpack/lib/action_dispatch/testing/integration.rb
+++ b/actionpack/lib/action_dispatch/testing/integration.rb
@@ -455,17 +455,24 @@ module ActionDispatch
       def before_setup # :nodoc:
         @app = nil
         @integration_session = nil
+        @execution_context = nil
+        super
+      end
+
+      def after_teardown # :nodoc:
+        remove!
         super
       end
 
       def integration_session
-        @integration_session ||= create_session(app)
+        @integration_session ||= create_session(app).tap { @execution_context = app.respond_to?(:executor) && app.executor.run! }
       end
 
       # Reset the current session. This is useful for testing multiple sessions
       # in a single test case.
       def reset!
-        @integration_session = create_session(app)
+        remove!
+        integration_session
       end
 
       def create_session(app)
@@ -481,6 +488,8 @@ module ActionDispatch
       end
 
       def remove! # :nodoc:
+        @execution_context.complete! if @execution_context
+        @execution_context = nil
         @integration_session = nil
       end