diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-08-09 02:24:15 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-08-09 02:24:15 +0000 |
| commit | af7a6e57cd718a6ca2182bfb7ee441ad3c1158fb (patch) | |
| tree | 78976ae48253127e0b52b20966f1b26193942060 /railties | |
| parent | e448b340ab7be7290fe3b2e5eebe609ba0f6b5da (diff) | |
| download | rails-af7a6e57cd718a6ca2182bfb7ee441ad3c1158fb.tar.gz rails-af7a6e57cd718a6ca2182bfb7ee441ad3c1158fb.tar.bz2 rails-af7a6e57cd718a6ca2182bfb7ee441ad3c1158fb.zip | |
Add missing mock directories from the autoload_paths configuration. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4736 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 5 | ||||
| -rw-r--r-- | railties/lib/initializer.rb | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index 795f6de2ff..168d0c6b78 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,7 +1,8 @@ *SVN* -* Nested controller scaffolding also nests the generated layout. [iain d broadf -oot] +* Add missing mock directories from the autoload_paths configuration. [Rick Olson] + +* Nested controller scaffolding also nests the generated layout. [iain d broadfoot] * Add "require 'dispatcher'" to webrick server in the continuing quest to squash webrick weirdness. [Nicholas Seckar] diff --git a/railties/lib/initializer.rb b/railties/lib/initializer.rb index ef83c2c259..d7cb740dcb 100644 --- a/railties/lib/initializer.rb +++ b/railties/lib/initializer.rb @@ -564,6 +564,9 @@ module Rails def default_autoload_paths paths = [] + mock_path = "#{root_path}/test/mocks/#{RAILS_ENV}" + paths << mock_path if File.directory?(mock_path) + # Add the app's controller directory paths.concat(Dir["#{root_path}/app/controllers/"]) |