Merge commit 'mainstream/master'

Conflicts:

	activerecord/lib/active_record/associations/association_proxy.rb
	activerecord/lib/active_record/callbacks.rb
	activeresource/lib/active_resource/base.rb

1 files changed, 18 insertions, 0 deletions

diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index 07303a510e..5147eeb482 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -30,6 +30,24 @@ class Initializer_load_environment_Test < Test::Unit::TestCase
 
 end
 
+class Initializer_eager_loading_Test < Test::Unit::TestCase
+  def setup
+    @config = ConfigurationMock.new("")
+    @config.cache_classes = true
+    @config.load_paths = [File.expand_path(File.dirname(__FILE__) + "/fixtures/eager")]
+    @config.eager_load_paths = [File.expand_path(File.dirname(__FILE__) + "/fixtures/eager")]
+    @initializer = Rails::Initializer.new(@config)
+    @initializer.set_load_path
+    @initializer.set_autoload_paths
+  end
+
+  def test_eager_loading_loads_parent_classes_before_children
+    assert_nothing_raised do
+      @initializer.load_application_classes
+    end
+  end
+end
+
 uses_mocha 'Initializer after_initialize' do
   class Initializer_after_initialize_with_blocks_environment_Test < Test::Unit::TestCase
     def setup