From 0f51e45307508d72f65b733dbbbd1c62f27a8bef Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Wed, 13 Jan 2010 18:24:16 -0600 Subject: optimise_named_routes is unnecessary --- actionpack/test/controller/resources_test.rb | 10 ---------- actionpack/test/controller/routing_test.rb | 4 ---- 2 files changed, 14 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/resources_test.rb b/actionpack/test/controller/resources_test.rb index 1a03396ae9..42d708ce59 100644 --- a/actionpack/test/controller/resources_test.rb +++ b/actionpack/test/controller/resources_test.rb @@ -30,16 +30,6 @@ module Backoffice end class ResourcesTest < ActionController::TestCase - # The assertions in these tests are incompatible with the hash method - # optimisation. This could indicate user level problems - def setup - ActionController::Base.optimise_named_routes = false - end - - def teardown - ActionController::Base.optimise_named_routes = true - end - def test_should_arrange_actions resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, :collection => { :rss => :get, :reorder => :post, :csv => :post }, diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb index c15eaade58..f390bbdc89 100644 --- a/actionpack/test/controller/routing_test.rb +++ b/actionpack/test/controller/routing_test.rb @@ -82,9 +82,6 @@ class LegacyRouteSetTests < Test::Unit::TestCase attr_reader :rs def setup - # These tests assume optimisation is on, so re-enable it. - ActionController::Base.optimise_named_routes = true - @rs = ::ActionController::Routing::RouteSet.new end @@ -632,7 +629,6 @@ class LegacyRouteSetTests < Test::Unit::TestCase end def test_routes_changed_correctly_after_clear - ActionController::Base.optimise_named_routes = true rs = ::ActionController::Routing::RouteSet.new rs.draw do |r| r.connect 'ca', :controller => 'ca', :action => "aa" -- cgit v1.2.3