aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/initializer.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/initializer.rb')
-rw-r--r--railties/lib/initializer.rb3
1 files changed, 3 insertions, 0 deletions
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/"])