4 files changed, 50 insertions, 4 deletions
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 57bd797ef0..60d644bd59 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -37,6 +37,13 @@ module ApplicationTests
       require "#{app_path}/config/environment"
       assert_respond_to Rails::Application, :routes_reloader
       assert_equal Rails::Application.routes_reloader, Rails.application.routes_reloader
+      assert_equal Rails::Application.routes_reloader, AppTemplate::Application.routes_reloader
+    end
+
+    test "Rails::Application responds to paths" do
+      require "#{app_path}/config/environment"
+      assert_respond_to AppTemplate::Application, :paths
+      assert_equal AppTemplate::Application.paths.app.views.to_a, ["#{app_path}/app/views"]
     end
 
     test "the application root is set correctly" do
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index d17be5b964..3cd16a69f9 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -9,7 +9,7 @@ Rails.application.config.root = Rails.root
 
 require 'rails/generators'
 require 'rails/generators/test_case'
-Rails::Generators.configure!
+
 require 'active_record'
 require 'action_dispatch'
 
diff --git a/railties/test/initializable_test.rb b/railties/test/initializable_test.rb
index 0c7378cb64..6a7e4dcc25 100644
--- a/railties/test/initializable_test.rb
+++ b/railties/test/initializable_test.rb
@@ -50,7 +50,7 @@ module InitializableTests
       $arr << 3
     end
 
-    initializer :four, :after => :one do
+    initializer :four, :after => :one, :before => :two do
       $arr << 4
     end
   end
@@ -97,7 +97,7 @@ module InitializableTests
         $arr << 3
       end
 
-      initializer :terminate, :after => :first do
+      initializer :terminate, :after => :first, :before => :startup do
         $arr << two
       end
 
@@ -121,6 +121,39 @@ module InitializableTests
     end
   end
 
+  module Interdependent
+    class PluginA
+      include Rails::Initializable
+
+      initializer "plugin_a.startup" do
+        $arr << 1
+      end
+
+      initializer "plugin_a.terminate" do
+        $arr << 4
+      end
+    end
+
+    class PluginB
+      include Rails::Initializable
+
+      initializer "plugin_b.startup", :after => "plugin_a.startup" do
+        $arr << 2
+      end
+
+      initializer "plugin_b.terminate", :before => "plugin_a.terminate" do
+        $arr << 3
+      end
+    end
+
+    class Application
+      include Rails::Initializable
+      def self.initializers
+        PluginB.initializers + PluginA.initializers
+      end
+    end
+  end
+
   class Basic < ActiveSupport::TestCase
     include ActiveSupport::Testing::Isolation
 
@@ -174,6 +207,12 @@ module InitializableTests
       Child.run_initializers
       assert_equal [5, 3, 1, 4, 2], $arr
     end
+
+    test "handles dependencies introduced before all initializers are loaded" do
+      $arr = []
+      Interdependent::Application.run_initializers
+      assert_equal [1, 2, 3, 4], $arr
+    end
   end
 
   class InstanceTest < ActiveSupport::TestCase
diff --git a/railties/test/railties/plugin_test.rb b/railties/test/railties/plugin_test.rb
index 997b692e49..09b859dcdd 100644
--- a/railties/test/railties/plugin_test.rb
+++ b/railties/test/railties/plugin_test.rb
@@ -47,7 +47,7 @@ module RailtiesTest
       assert_equal :debug, LEVEL
     end
 
-    test "plugin_init_is_ran_before_application_ones" do
+    test "plugin_init_is_run_before_application_ones" do
       plugin "foo", "$foo = true" do |plugin|
         plugin.write "lib/foo.rb", "module Foo; end"
       end