diff options
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
| -rw-r--r-- | railties/test/application/configuration_test.rb | 16 |
2 files changed, 17 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb index d714c5ac41..5419b46f19 100644 --- a/railties/lib/rails/application.rb +++ b/railties/lib/rails/application.rb @@ -143,7 +143,7 @@ module Rails # Used by Passenger to ensure everything's loaded before forking and # to avoid autoload race conditions in JRuby. initializer :preload_frameworks do - ActiveSupport::Autoload.eager_load! if config.preload_frameworks + ActiveSupport::Autoload.eager_autoload! if config.preload_frameworks end initializer :initialize_cache do diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb index 4d9da525d7..ece41f9de8 100644 --- a/railties/test/application/configuration_test.rb +++ b/railties/test/application/configuration_test.rb @@ -83,5 +83,21 @@ module ApplicationTests require "#{app_path}/config/application" end end + + test "Frameworks are not preloaded by default" do + require "#{app_path}/config/environment" + + assert ActionController.autoload?(:RecordIdentifier) + end + + test "frameworks are preloaded with config.preload_frameworks is set" do + add_to_config <<-RUBY + config.preload_frameworks = true + RUBY + + require "#{app_path}/config/environment" + + assert !ActionController.autoload?(:RecordIdentifier) + end end end |