diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/helpers/test_helper.rb | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index e131245cea..bd8eb1c33d 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fixed the test_helper.rb to be safe for requiring controllers from multiple spots, like app/controllers/article_controller.rb and app/controllers/admin/article_controller.rb, without reloading the environment twice #1390 [Nicholas Seckar] + * Fixed Webrick to escape + characters in URL's the same way that lighttpd and apache do #1397 [Nicholas Seckar] * Added -e/--environment option to script/runner #1408 [fbeausoleil@ftml.net] diff --git a/railties/helpers/test_helper.rb b/railties/helpers/test_helper.rb index d177ec3515..5328ccdf5f 100644 --- a/railties/helpers/test_helper.rb +++ b/railties/helpers/test_helper.rb @@ -1,5 +1,8 @@ ENV["RAILS_ENV"] = "test" -require File.dirname(__FILE__) + "/../config/environment" + +# Expand the path to environment so that Ruby does not load it multiple times +# File.expand_path can be removed if Ruby 1.9 is in use. +require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'application' require 'test/unit' |