diff options
| author | Gonçalo Silva <goncalossilva@gmail.com> | 2010-07-10 17:36:10 +0100 |
|---|---|---|
| committer | Gonçalo Silva <goncalossilva@gmail.com> | 2010-07-10 17:36:10 +0100 |
| commit | cd2bbed9846d84a1230a1b9e52843eedca17b28d (patch) | |
| tree | 5214b7855f3d102e4c22239b9d62bc5717cb3547 /railties/test/rails_info_controller_test.rb | |
| parent | d2c633ba0bfb7baacdee89a46d7d036d24c68817 (diff) | |
| parent | 80e47d7b88dcc732ebeb5290faab6e529829dac6 (diff) | |
| download | rails-cd2bbed9846d84a1230a1b9e52843eedca17b28d.tar.gz rails-cd2bbed9846d84a1230a1b9e52843eedca17b28d.tar.bz2 rails-cd2bbed9846d84a1230a1b9e52843eedca17b28d.zip | |
Merge branch 'master' of http://github.com/rails/rails
Diffstat (limited to 'railties/test/rails_info_controller_test.rb')
| -rw-r--r-- | railties/test/rails_info_controller_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/rails_info_controller_test.rb b/railties/test/rails_info_controller_test.rb index aa76979c27..687c2d1568 100644 --- a/railties/test/rails_info_controller_test.rb +++ b/railties/test/rails_info_controller_test.rb @@ -11,7 +11,7 @@ class InfoControllerTest < ActionController::TestCase tests Rails::InfoController def setup - Rails.application.routes.draw do |map| + Rails.application.routes.draw do match '/rails/info/properties' => "rails/info#properties" end @controller.stubs(:consider_all_requests_local? => false, :local_request? => true) |