aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2019-05-08 17:00:35 -0400
committerGitHub <noreply@github.com>2019-05-08 17:00:35 -0400
commitdd868aa0c82ab45d1ca21febf179bb5cd1c21766 (patch)
tree866b93d0aa56cf3fcca33ecf92b215f1ddc1393b /actionpack/test/dispatch
parent52125dc0f8669d8dd497427c7b177d5d04106e0c (diff)
parent6f549ce53f3398403d4c2a47f9ecba910be256dd (diff)
downloadrails-dd868aa0c82ab45d1ca21febf179bb5cd1c21766.tar.gz
rails-dd868aa0c82ab45d1ca21febf179bb5cd1c21766.tar.bz2
rails-dd868aa0c82ab45d1ca21febf179bb5cd1c21766.zip
Merge pull request #36221 from jhawthorn/middleware_instrumentation
Only build middleware proxy when instrumentating
Diffstat (limited to 'actionpack/test/dispatch')
-rw-r--r--actionpack/test/dispatch/middleware_stack_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/dispatch/middleware_stack_test.rb b/actionpack/test/dispatch/middleware_stack_test.rb
index 90f2eccd19..c534e60c74 100644
--- a/actionpack/test/dispatch/middleware_stack_test.rb
+++ b/actionpack/test/dispatch/middleware_stack_test.rb
@@ -121,9 +121,6 @@ class MiddlewareStackTest < ActiveSupport::TestCase
end
test "instruments the execution of middlewares" do
- app = @stack.build(proc { |env| [200, {}, []] })
- env = {}
-
events = []
subscriber = proc do |*args|
@@ -131,6 +128,9 @@ class MiddlewareStackTest < ActiveSupport::TestCase
end
ActiveSupport::Notifications.subscribed(subscriber, "process_middleware.action_dispatch") do
+ app = @stack.build(proc { |env| [200, {}, []] })
+
+ env = {}
app.call(env)
end