aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_unit.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-10-03 23:18:32 -0500
committerJoshua Peek <josh@joshpeek.com>2009-10-03 23:18:32 -0500
commit61411f2aeb29edba2d8cd2008020044799ea3d61 (patch)
treed2e6c4b5a30e27a9b8739ed6a050c30e7be70d20 /actionpack/test/abstract_unit.rb
parent8287a112c92aff73d45536f0942d9dc7ba107bd7 (diff)
downloadrails-61411f2aeb29edba2d8cd2008020044799ea3d61.tar.gz
rails-61411f2aeb29edba2d8cd2008020044799ea3d61.tar.bz2
rails-61411f2aeb29edba2d8cd2008020044799ea3d61.zip
Redraw default routes on all internal integration tests. We don't need SimpleRouteCase anymore
Diffstat (limited to 'actionpack/test/abstract_unit.rb')
-rw-r--r--actionpack/test/abstract_unit.rb18
1 files changed, 8 insertions, 10 deletions
diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
index c1153b01de..950c85a34b 100644
--- a/actionpack/test/abstract_unit.rb
+++ b/actionpack/test/abstract_unit.rb
@@ -81,6 +81,12 @@ class ActionController::IntegrationTest < ActiveSupport::TestCase
ActionController::Routing.const_set(:Routes, real_routes) if real_routes
self.class.app = self.class.build_app
end
+
+ setup do
+ ActionController::Routing::Routes.draw do |map|
+ map.connect ':controller/:action/:id'
+ end
+ end
end
module ActionView
@@ -160,9 +166,9 @@ module ActionController
super
end
end
-
+
Base.view_paths = FIXTURE_LOAD_PATH
-
+
class TestCase
include TestProcess
@@ -214,11 +220,3 @@ module ActionController
end
end
end
-
-class SimpleRouteCase < Rack::TestCase
- setup do
- ActionController::Routing::Routes.draw do |map|
- map.connect ':controller/:action/:id'
- end
- end
-end