From 61411f2aeb29edba2d8cd2008020044799ea3d61 Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sat, 3 Oct 2009 23:18:32 -0500 Subject: Redraw default routes on all internal integration tests. We don't need SimpleRouteCase anymore --- actionpack/test/abstract_unit.rb | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'actionpack/test/abstract_unit.rb') 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 -- cgit v1.2.3