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

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]
 

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/"])