1 files changed, 56 insertions, 28 deletions
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb
index 03c343c475..cddc79cc85 100644
--- a/railties/test/application/multiple_applications_test.rb
+++ b/railties/test/application/multiple_applications_test.rb
@@ -8,6 +8,7 @@ module ApplicationTests
       build_app(initializers: true)
       boot_rails
       require "#{rails_root}/config/environment"
+      Rails.application.config.some_setting = 'something_or_other'
     end
 
     def teardown
@@ -18,7 +19,13 @@ module ApplicationTests
       clone = Rails.application.clone
 
       assert_equal Rails.application.config, clone.config, "The cloned application should get a copy of the config"
-      assert_equal Rails.application.config.secret_key_base, clone.config.secret_key_base, "The base secret key on the config should be the same"
+      assert_equal Rails.application.config.some_setting, clone.config.some_setting, "The some_setting on the config should be the same"
+    end
+
+    def test_inheriting_multiple_times_from_application
+      new_application_class = Class.new(Rails::Application)
+
+      assert_not_equal Rails.application.object_id, new_application_class.instance.object_id
     end
 
     def test_initialization_of_multiple_copies_of_same_application
@@ -30,23 +37,23 @@ module ApplicationTests
     end
 
     def test_initialization_of_application_with_previous_config
-      application1 = AppTemplate::Application.new(config: Rails.application.config)
-      application2 = AppTemplate::Application.new
+      application1 = AppTemplate::Application.create(config: Rails.application.config)
+      application2 = AppTemplate::Application.create
 
       assert_equal Rails.application.config, application1.config, "Creating a new application while setting an initial config should result in the same config"
       assert_not_equal Rails.application.config, application2.config, "New applications without setting an initial config should not have the same config"
     end
 
     def test_initialization_of_application_with_previous_railties
-      application1 = AppTemplate::Application.new(railties: Rails.application.railties)
-      application2 = AppTemplate::Application.new
+      application1 = AppTemplate::Application.create(railties: Rails.application.railties)
+      application2 = AppTemplate::Application.create
 
       assert_equal Rails.application.railties, application1.railties
       assert_not_equal Rails.application.railties, application2.railties
     end
 
     def test_initialize_new_application_with_all_previous_initialization_variables
-      application1 = AppTemplate::Application.new(
+      application1 = AppTemplate::Application.create(
         config:           Rails.application.config,
         railties:         Rails.application.railties,
         routes_reloader:  Rails.application.routes_reloader,
@@ -66,26 +73,26 @@ module ApplicationTests
     end
 
     def test_rake_tasks_defined_on_different_applications_go_to_the_same_class
-      $run_count = 0
+      run_count = 0
 
       application1 = AppTemplate::Application.new
       application1.rake_tasks do
-        $run_count += 1
+        run_count += 1
       end
 
       application2 = AppTemplate::Application.new
       application2.rake_tasks do
-        $run_count += 1
+        run_count += 1
       end
 
       require "#{app_path}/config/environment"
 
-      assert_equal 0, $run_count, "The count should stay at zero without any calls to the rake tasks"
+      assert_equal 0, run_count, "The count should stay at zero without any calls to the rake tasks"
       require 'rake'
       require 'rake/testtask'
       require 'rdoc/task'
       Rails.application.load_tasks
-      assert_equal 2, $run_count, "Calling a rake task should result in two increments to the count"
+      assert_equal 2, run_count, "Calling a rake task should result in two increments to the count"
     end
 
     def test_multiple_applications_can_be_initialized
@@ -94,36 +101,56 @@ module ApplicationTests
 
     def test_initializers_run_on_different_applications_go_to_the_same_class
       application1 = AppTemplate::Application.new
-      $run_count = 0
+      run_count = 0
 
       AppTemplate::Application.initializer :init0 do
-        $run_count += 1
+        run_count += 1
       end
 
       application1.initializer :init1 do
-        $run_count += 1
+        run_count += 1
       end
 
       AppTemplate::Application.new.initializer :init2 do
-        $run_count += 1
+        run_count += 1
       end
 
-      assert_equal 0, $run_count, "Without loading the initializers, the count should be 0"
+      assert_equal 0, run_count, "Without loading the initializers, the count should be 0"
 
-      # Set config.eager_load to false so that a eager_load warning doesn't pop up
+      # Set config.eager_load to false so that an eager_load warning doesn't pop up
       AppTemplate::Application.new { config.eager_load = false }.initialize!
 
-      assert_equal 3, $run_count, "There should have been three initializers that incremented the count"
+      assert_equal 3, run_count, "There should have been three initializers that incremented the count"
+    end
+
+    def test_consoles_run_on_different_applications_go_to_the_same_class
+      run_count = 0
+      AppTemplate::Application.console { run_count += 1 }
+      AppTemplate::Application.new.console { run_count += 1 }
+
+      assert_equal 0, run_count, "Without loading the consoles, the count should be 0"
+      Rails.application.load_console
+      assert_equal 2, run_count, "There should have been two consoles that increment the count"
+    end
+
+    def test_generators_run_on_different_applications_go_to_the_same_class
+      run_count = 0
+      AppTemplate::Application.generators { run_count += 1 }
+      AppTemplate::Application.new.generators { run_count += 1 }
+
+      assert_equal 0, run_count, "Without loading the generators, the count should be 0"
+      Rails.application.load_generators
+      assert_equal 2, run_count, "There should have been two generators that increment the count"
     end
 
     def test_runners_run_on_different_applications_go_to_the_same_class
-      $run_count = 0
-      AppTemplate::Application.runner { $run_count += 1 }
-      AppTemplate::Application.new.runner { $run_count += 1 }
+      run_count = 0
+      AppTemplate::Application.runner { run_count += 1 }
+      AppTemplate::Application.new.runner { run_count += 1 }
 
-      assert_equal 0, $run_count, "Without loading the runners, the count should be 0"
+      assert_equal 0, run_count, "Without loading the runners, the count should be 0"
       Rails.application.load_runner
-      assert_equal 2, $run_count, "There should have been two runners that increment the count"
+      assert_equal 2, run_count, "There should have been two runners that increment the count"
     end
 
     def test_isolate_namespace_on_an_application
@@ -134,13 +161,14 @@ module ApplicationTests
 
     def test_inserting_configuration_into_application
       app = AppTemplate::Application.new(config: Rails.application.config)
-      new_config = Rails::Application::Configuration.new("root_of_application")
-      new_config.secret_key_base = "some_secret_key_dude"
-      app.config.secret_key_base = "a_different_secret_key"
+      app.config.some_setting = "a_different_setting"
+      assert_equal "a_different_setting", app.config.some_setting, "The configuration's some_setting should be set."
 
-      assert_equal "a_different_secret_key", app.config.secret_key_base, "The configuration's secret key should be set."
+      new_config = Rails::Application::Configuration.new("root_of_application")
+      new_config.some_setting = "some_setting_dude"
       app.config = new_config
-      assert_equal "some_secret_key_dude", app.config.secret_key_base, "The configuration's secret key should have changed."
+
+      assert_equal "some_setting_dude", app.config.some_setting, "The configuration's some_setting should have changed."
       assert_equal "root_of_application", app.config.root, "The root should have changed to the new config's root."
       assert_equal new_config, app.config, "The application's config should have changed to the new config."
     end