Make console and generators blocks works at Application instance level

Like rake tasks and runner blocks these blocks should also being shared
between applications since they are stored at the classes.

Fixes #14748

4 files changed, 114 insertions, 0 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 8d22f8bc48..6a31a923a7 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,3 +1,9 @@
+*   Fix `console` and `generators` blocks defined at different environments.
+
+    Fixes #14748.
+
+    *Rafael Mendonça França*
+
 *   Move configuration of asset precompile list and version to an initializer.
 
     *Matthew Draper*
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 8d080feb04..2fde974732 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -231,6 +231,18 @@ module Rails
       self.class.runner(&blk)
     end
 
+    # Sends any console called in the instance of a new application up
+    # to the +console+ method defined in Rails::Railtie.
+    def console(&blk)
+      self.class.console(&blk)
+    end
+
+    # Sends any generators called in the instance of a new application up
+    # to the +generators+ method defined in Rails::Railtie.
+    def generators(&blk)
+      self.class.generators(&blk)
+    end
+
     # Sends the +isolate_namespace+ method up to the class method.
     def isolate_namespace(mod)
       self.class.isolate_namespace(mod)
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index a7f35929f6..09aba1c2e9 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -803,5 +803,81 @@ module ApplicationTests
 
       assert_not_nil SourceAnnotationExtractor::Annotation.extensions[/\.(coffee)$/]
     end
+
+    test "rake_tasks block works at instance level" do
+      $ran_block = false
+
+      app_file "config/environments/development.rb", <<-RUBY
+        Rails.application.configure do
+          rake_tasks do
+            $ran_block = true
+          end
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      require 'rake'
+      require 'rake/testtask'
+      require 'rdoc/task'
+
+      Rails.application.load_tasks
+      assert $ran_block
+    end
+
+    test "generators block works at instance level" do
+      $ran_block = false
+
+      app_file "config/environments/development.rb", <<-RUBY
+        Rails.application.configure do
+          generators do
+            $ran_block = true
+          end
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      Rails.application.load_generators
+      assert $ran_block
+    end
+
+    test "console block works at instance level" do
+      $ran_block = false
+
+      app_file "config/environments/development.rb", <<-RUBY
+        Rails.application.configure do
+          console do
+            $ran_block = true
+          end
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      Rails.application.load_console
+      assert $ran_block
+    end
+
+    test "runner block works at instance level" do
+      $ran_block = false
+
+      app_file "config/environments/development.rb", <<-RUBY
+        Rails.application.configure do
+          runner do
+            $ran_block = true
+          end
+        end
+      RUBY
+
+      require "#{app_path}/config/environment"
+
+      assert !$ran_block
+      Rails.application.load_runner
+      assert $ran_block
+    end
   end
 end
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb
index 42b319178d..f8d8a673ae 100644
--- a/railties/test/application/multiple_applications_test.rb
+++ b/railties/test/application/multiple_applications_test.rb
@@ -122,6 +122,26 @@ module ApplicationTests
       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 }