aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/rescue_test.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionpack/test/controller/rescue_test.rb')
-rw-r--r--actionpack/test/controller/rescue_test.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/actionpack/test/controller/rescue_test.rb b/actionpack/test/controller/rescue_test.rb
index a2a2a3ee29..744ca9286c 100644
--- a/actionpack/test/controller/rescue_test.rb
+++ b/actionpack/test/controller/rescue_test.rb
@@ -143,8 +143,11 @@ end
class RescueControllerTest < ActionController::TestCase
FIXTURE_PUBLIC = "#{File.dirname(__FILE__)}/../fixtures".freeze
- setup :set_all_requests_local
- setup :populate_exception_object
+ def setup
+ super
+ set_all_requests_local
+ populate_exception_object
+ end
def set_all_requests_local
RescueController.consider_all_requests_local = true