aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-08-09 14:25:35 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-08-09 14:50:26 -0700
commit0b29c7bb7b40f66977e374667daf7239970bf635 (patch)
treeab3bdcdc09e99dfa608e02afd0282a8d98772ef8
parent6794e92b204572d75a07bd6413bdae6ae22d5a82 (diff)
downloadrails-0b29c7bb7b40f66977e374667daf7239970bf635.tar.gz
rails-0b29c7bb7b40f66977e374667daf7239970bf635.tar.bz2
rails-0b29c7bb7b40f66977e374667daf7239970bf635.zip
switch callbacks to minitest hooks
-rw-r--r--actionpack/test/abstract_unit.rb9
1 files changed, 6 insertions, 3 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index 56cebee678..60bf583dfd 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -159,8 +159,9 @@ class BasicController
end
class ActionDispatch::IntegrationTest < ActiveSupport::TestCase
- setup do
+ def before_setup
@routes = SharedTestRoutes
+ super
end
def self.build_app(routes = nil)
@@ -291,8 +292,9 @@ module ActionController
class TestCase
include ActionDispatch::TestProcess
- setup do
+ def before_setup
@routes = SharedTestRoutes
+ super
end
end
end
@@ -304,8 +306,9 @@ module ActionView
class TestCase
# Must repeat the setup because AV::TestCase is a duplication
# of AC::TestCase
- setup do
+ def before_setup
@routes = SharedTestRoutes
+ super
end
end
end