From 41488adbb89a09fa96188486f8414842ff28c848 Mon Sep 17 00:00:00 2001 From: eileencodes Date: Wed, 22 Jun 2016 13:40:30 -0400 Subject: Fix failing railties tests Railties tests didn't know about the new config option added in 80b416f so it needed to be added to the railties generators for configs. --- .../rails/app/templates/config/environments/development.rb.tt | 3 +++ .../rails/app/templates/config/environments/production.rb.tt | 3 +++ .../generators/rails/app/templates/config/environments/test.rb.tt | 3 +++ 3 files changed, 9 insertions(+) (limited to 'railties/lib') diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt index f3ccf95045..dd4745eb99 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/development.rb.tt @@ -57,4 +57,7 @@ Rails.application.configure do # Use an evented file watcher to asynchronously detect changes in source code, # routes, locales, etc. This feature depends on the listen gem. <%= '# ' unless depend_on_listen? %>config.file_watcher = ActiveSupport::EventedFileUpdateChecker + + # Enable the autoload loading behavior even if the application is eager loaded + config.enable_dependency_loading = false end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt index 363af05459..7afb17f733 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/production.rb.tt @@ -91,4 +91,7 @@ Rails.application.configure do # Do not dump schema after migrations. config.active_record.dump_schema_after_migration = false <%- end -%> + + # Enable the autoload loading behavior even if the application is eager loaded + config.enable_dependency_loading = false end diff --git a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt index 42fee3b036..eabbbc2eab 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/environments/test.rb.tt @@ -41,4 +41,7 @@ Rails.application.configure do # Raises error for missing translations # config.action_view.raise_on_missing_translations = true + + # Enable the autoload loading behavior even if the application is eager loaded + config.enable_dependency_loading = false end -- cgit v1.2.3