diff options
| author | eileencodes <eileencodes@gmail.com> | 2016-06-22 13:40:30 -0400 |
|---|---|---|
| committer | eileencodes <eileencodes@gmail.com> | 2016-06-22 13:41:49 -0400 |
| commit | 41488adbb89a09fa96188486f8414842ff28c848 (patch) | |
| tree | a3a89260130e1356d5b89b5d8668527e34ff020d /railties | |
| parent | 80b416f5e692ae79f4062f59fed6c7d7648a8af0 (diff) | |
| download | rails-41488adbb89a09fa96188486f8414842ff28c848.tar.gz rails-41488adbb89a09fa96188486f8414842ff28c848.tar.bz2 rails-41488adbb89a09fa96188486f8414842ff28c848.zip | |
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.
Diffstat (limited to 'railties')
3 files changed, 9 insertions, 0 deletions
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 |