diff options
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 12 | 
1 files changed, 8 insertions, 4 deletions
| diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index 99cf9168e1..a0484c0868 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -4,10 +4,6 @@ require 'action_controller'  require 'rails/info'  require 'rails/info_controller' -ActionController::Routing::Routes.draw do |map| -  map.connect ':controller/:action/:id' -end -  module ActionController    class Base      include ActionController::Testing @@ -18,9 +14,17 @@ class InfoControllerTest < ActionController::TestCase    tests Rails::InfoController    def setup +    ActionController::Routing.use_controllers!(['rails/info']) +    ActionController::Routing::Routes.draw do |map| +      map.connect ':controller/:action/:id' +    end      @controller.stubs(:consider_all_requests_local => false, :local_request? => true)    end +  def teardown +    ActionController::Routing.use_controllers! nil +  end +    test "info controller does not allow remote requests" do      @controller.stubs(:consider_all_requests_local => false, :local_request? => false)      get :properties | 
