diff options
| author | Joshua Peek <josh@joshpeek.com> | 2010-01-13 18:24:16 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2010-01-13 20:22:53 -0600 |
| commit | 0f51e45307508d72f65b733dbbbd1c62f27a8bef (patch) | |
| tree | 9ff3d4f75583d8b722a46a268b8d1241b8139d1e /actionpack | |
| parent | 9038a4af354fc6edc2d112c273864ada1c44b05b (diff) | |
| download | rails-0f51e45307508d72f65b733dbbbd1c62f27a8bef.tar.gz rails-0f51e45307508d72f65b733dbbbd1c62f27a8bef.tar.bz2 rails-0f51e45307508d72f65b733dbbbd1c62f27a8bef.zip | |
optimise_named_routes is unnecessary
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 5 | ||||
| -rw-r--r-- | actionpack/test/controller/resources_test.rb | 10 | ||||
| -rw-r--r-- | actionpack/test/controller/routing_test.rb | 4 |
3 files changed, 0 insertions, 19 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index a90f798cd5..3d50e79a23 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -31,11 +31,6 @@ module ActionController @before_filter_chain_aborted @_headers @_params @_flash @_response) - # Indicates whether or not optimise the generated named - # route helper methods - cattr_accessor :optimise_named_routes - self.optimise_named_routes = true - cattr_accessor :resources_path_names self.resources_path_names = { :new => 'new', :edit => 'edit' } 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" |