aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/failsafe.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-18 12:57:37 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-18 12:57:37 -0600
commit3b35366d5df8c8d8a7b216c42dd96b0cfa38fee4 (patch)
tree0632280c179df20797a3e59ec7e4df7e315aff06 /actionpack/lib/action_controller/failsafe.rb
parent2e22c7fda00f78db79cb2dcc79495c085035240d (diff)
downloadrails-3b35366d5df8c8d8a7b216c42dd96b0cfa38fee4.tar.gz
rails-3b35366d5df8c8d8a7b216c42dd96b0cfa38fee4.tar.bz2
rails-3b35366d5df8c8d8a7b216c42dd96b0cfa38fee4.zip
Use more generic test env flag
Diffstat (limited to 'actionpack/lib/action_controller/failsafe.rb')
-rw-r--r--actionpack/lib/action_controller/failsafe.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/failsafe.rb b/actionpack/lib/action_controller/failsafe.rb
index b1e9957b49..567581142c 100644
--- a/actionpack/lib/action_controller/failsafe.rb
+++ b/actionpack/lib/action_controller/failsafe.rb
@@ -11,7 +11,7 @@ module ActionController
@app.call(env)
rescue Exception => exception
# Reraise exception in test environment
- if env["action_controller.test"]
+ if env["rack.test"]
raise exception
else
failsafe_response(exception)