1 files changed, 25 insertions, 0 deletions
diff --git a/railties/test/application/initializer_test.rb b/railties/test/application/initializer_test.rb
index 9583e1606c..1b6af718c0 100644
--- a/railties/test/application/initializer_test.rb
+++ b/railties/test/application/initializer_test.rb
@@ -29,5 +29,30 @@ module ApplicationTests
       MyApp.new
       assert $:.include?("#{app_path}/app/models")
     end
+
+    test "adding an unknown framework raises an error" do
+      class MyApp < Rails::Application
+        config.frameworks << :action_foo
+      end
+
+      assert_raises RuntimeError do
+        MyApp.new
+      end
+    end
+
+    test "eager loading loads parent classes before children" do
+      app_file "lib/zoo.rb", <<-ZOO
+        class Zoo ; include ReptileHouse ; end
+      ZOO
+      app_file "lib/zoo/reptile_house.rb", <<-ZOO
+        module Zoo::ReptileHouse ; end
+      ZOO
+
+      Rails::Initializer.run do |config|
+        config.eager_load_paths = "#{app_path}/lib"
+      end
+
+      assert Zoo
+    end
   end
 end
 \ No newline at end of file