Stop adding the antiquated test/mocks/* directories and only add them to the path if theyre still there for legacy reasons [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9102 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

railties/CHANGELOG

@@ -1,5 +1,7 @@
 *SVN*
 
+* Stop adding the antiquated test/mocks/* directories and only add them to the path if they're still there for legacy reasons [DHH]
+
 * Added that gems can now be plugins if they include rails/init.rb #11444 [jbarnette]
 
 * Added Plugin#about method to programmatically access the about.yml in a plugin #10979 [lazyatom]

railties/lib/initializer.rb

@@ -615,7 +615,10 @@ def default_frameworks
       end
 
       def default_load_paths
-        paths = ["#{root_path}/test/mocks/#{environment}"]
+        paths = []
+        
+        # Add the old mock paths only if the directories exists
+        paths.concat(Dir["#{root_path}/test/mocks/#{environment}"]) if File.exists?("#{root_path}/test/mocks/#{environment}")
 
         # Add the app's controller directory
         paths.concat(Dir["#{root_path}/app/controllers/"])

railties/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -155,8 +155,6 @@ def mysql_socket_location
     test/fixtures
     test/functional
     test/integration
-    test/mocks/development
-    test/mocks/test
     test/unit
     vendor
     vendor/plugins