From d93427840ee58ea37cd4a90adf4b2a0ed20cd220 Mon Sep 17 00:00:00 2001
From: Prathamesh Sonpatki <csonpatki@gmail.com>
Date: Sat, 2 Jul 2016 20:35:35 +0530
Subject: [PATCH] Remove unused boot_rails method and it's usage

- The `boot_rails` method from abstract_unit.rb is empty after 2abcdfd978fdcd491576a237e8c6b.
- So let's remove it and its usage.
---
 railties/test/application/asset_debugging_test.rb            | 2 --
 railties/test/application/assets_test.rb                     | 1 -
 railties/test/application/configuration/custom_test.rb       | 1 -
 railties/test/application/configuration_test.rb              | 3 +--
 railties/test/application/console_test.rb                    | 1 -
 railties/test/application/generators_test.rb                 | 1 -
 railties/test/application/initializers/frameworks_test.rb    | 1 -
 railties/test/application/initializers/hooks_test.rb         | 1 -
 railties/test/application/initializers/i18n_test.rb          | 1 -
 railties/test/application/initializers/load_path_test.rb     | 1 -
 railties/test/application/initializers/notifications_test.rb | 1 -
 railties/test/application/integration_test_case_test.rb      | 1 -
 railties/test/application/loading_test.rb                    | 1 -
 railties/test/application/mailer_previews_test.rb            | 1 -
 railties/test/application/middleware/cache_test.rb           | 1 -
 railties/test/application/middleware/cookies_test.rb         | 1 -
 railties/test/application/middleware/exceptions_test.rb      | 1 -
 railties/test/application/middleware/sendfile_test.rb        | 1 -
 railties/test/application/middleware/session_test.rb         | 1 -
 railties/test/application/middleware_test.rb                 | 1 -
 railties/test/application/multiple_applications_test.rb      | 1 -
 railties/test/application/paths_test.rb                      | 1 -
 railties/test/application/rackup_test.rb                     | 1 -
 railties/test/application/rake/dbs_test.rb                   | 1 -
 railties/test/application/rake/framework_test.rb             | 1 -
 railties/test/application/rake/migrations_test.rb            | 1 -
 railties/test/application/rake/notes_test.rb                 | 1 -
 railties/test/application/rake/restart_test.rb               | 1 -
 railties/test/application/rake_test.rb                       | 1 -
 railties/test/application/rendering_test.rb                  | 1 -
 railties/test/application/routing_test.rb                    | 1 -
 railties/test/application/runner_test.rb                     | 5 ++---
 railties/test/application/test_test.rb                       | 1 -
 railties/test/application/url_generation_test.rb             | 2 --
 railties/test/isolation/abstract_unit.rb                     | 3 ---
 railties/test/railties/engine_test.rb                        | 1 -
 railties/test/railties/mounted_engine_test.rb                | 2 --
 railties/test/railties/railtie_test.rb                       | 1 -
 38 files changed, 3 insertions(+), 46 deletions(-)

diff --git a/railties/test/application/asset_debugging_test.rb b/railties/test/application/asset_debugging_test.rb
index bcb6aff0d752d..19327efcc83b3 100644
--- a/railties/test/application/asset_debugging_test.rb
+++ b/railties/test/application/asset_debugging_test.rb
@@ -28,8 +28,6 @@ class PostsController < ActionController::Base
       RUBY
 
       ENV["RAILS_ENV"] = "production"
-
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/assets_test.rb b/railties/test/application/assets_test.rb
index 12bdbcf23eb88..20329c6e606e4 100644
--- a/railties/test/application/assets_test.rb
+++ b/railties/test/application/assets_test.rb
@@ -9,7 +9,6 @@ class AssetsTest < ActiveSupport::TestCase
 
     def setup
       build_app(initializers: true)
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/configuration/custom_test.rb b/railties/test/application/configuration/custom_test.rb
index 28b3b2f2d673e..082fd6fb8936c 100644
--- a/railties/test/application/configuration/custom_test.rb
+++ b/railties/test/application/configuration/custom_test.rb
@@ -5,7 +5,6 @@ module ConfigurationTests
     class CustomTest < ActiveSupport::TestCase
       def setup
         build_app
-        boot_rails
         FileUtils.rm_rf("#{app_path}/config/environments")
       end
 
diff --git a/railties/test/application/configuration_test.rb b/railties/test/application/configuration_test.rb
index 7ec25aeca1356..68c9b9774d095 100644
--- a/railties/test/application/configuration_test.rb
+++ b/railties/test/application/configuration_test.rb
@@ -51,7 +51,6 @@ def app(env = 'development')
 
     def setup
       build_app
-      boot_rails
       supress_default_config
     end
 
@@ -570,7 +569,7 @@ def index
       app_file 'config/secrets.yml', <<-YAML
         shared:
           api_key: 3b7cd727
-        
+
         development:
           api_key: abc12345
       YAML
diff --git a/railties/test/application/console_test.rb b/railties/test/application/console_test.rb
index ea68e63f8f8dd..ba60b54df323e 100644
--- a/railties/test/application/console_test.rb
+++ b/railties/test/application/console_test.rb
@@ -5,7 +5,6 @@ class ConsoleTest < ActiveSupport::TestCase
 
   def setup
     build_app
-    boot_rails
   end
 
   def teardown
diff --git a/railties/test/application/generators_test.rb b/railties/test/application/generators_test.rb
index 644af0e737f30..4e300bce63c16 100644
--- a/railties/test/application/generators_test.rb
+++ b/railties/test/application/generators_test.rb
@@ -6,7 +6,6 @@ class GeneratorsTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 44209a52f75c3..812bb87009e9a 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -6,7 +6,6 @@ class FrameworksTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
diff --git a/railties/test/application/initializers/hooks_test.rb b/railties/test/application/initializers/hooks_test.rb
index b2cea0a8e1529..3c0c2ac1c0b28 100644
--- a/railties/test/application/initializers/hooks_test.rb
+++ b/railties/test/application/initializers/hooks_test.rb
@@ -6,7 +6,6 @@ class HooksTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
diff --git a/railties/test/application/initializers/i18n_test.rb b/railties/test/application/initializers/i18n_test.rb
index 0f9bb410537b5..fcafbb6d04898 100644
--- a/railties/test/application/initializers/i18n_test.rb
+++ b/railties/test/application/initializers/i18n_test.rb
@@ -6,7 +6,6 @@ class I18nTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
       require "rails/all"
     end
diff --git a/railties/test/application/initializers/load_path_test.rb b/railties/test/application/initializers/load_path_test.rb
index cd05956356d56..caab7c0c8a14f 100644
--- a/railties/test/application/initializers/load_path_test.rb
+++ b/railties/test/application/initializers/load_path_test.rb
@@ -6,7 +6,6 @@ class LoadPathTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
diff --git a/railties/test/application/initializers/notifications_test.rb b/railties/test/application/initializers/notifications_test.rb
index 95655b74cfff6..1a7914b4eb641 100644
--- a/railties/test/application/initializers/notifications_test.rb
+++ b/railties/test/application/initializers/notifications_test.rb
@@ -6,7 +6,6 @@ class NotificationsTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/integration_test_case_test.rb b/railties/test/application/integration_test_case_test.rb
index d106d5159ab28..52df5a2e5a659 100644
--- a/railties/test/application/integration_test_case_test.rb
+++ b/railties/test/application/integration_test_case_test.rb
@@ -6,7 +6,6 @@ class IntegrationTestCaseTest < ActiveSupport::TestCase
 
     setup do
       build_app
-      boot_rails
     end
 
     teardown do
diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index efb21ae4734a7..fe1847d8a52b7 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -5,7 +5,6 @@ class LoadingTest < ActiveSupport::TestCase
 
   def setup
     build_app
-    boot_rails
   end
 
   def teardown
diff --git a/railties/test/application/mailer_previews_test.rb b/railties/test/application/mailer_previews_test.rb
index 643d876a26382..3bb77ab0f528b 100644
--- a/railties/test/application/mailer_previews_test.rb
+++ b/railties/test/application/mailer_previews_test.rb
@@ -9,7 +9,6 @@ class MailerPreviewsTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/middleware/cache_test.rb b/railties/test/application/middleware/cache_test.rb
index c951dabd6c77f..9802de4a60b1c 100644
--- a/railties/test/application/middleware/cache_test.rb
+++ b/railties/test/application/middleware/cache_test.rb
@@ -6,7 +6,6 @@ class CacheTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       require 'rack/test'
       extend Rack::Test::Methods
     end
diff --git a/railties/test/application/middleware/cookies_test.rb b/railties/test/application/middleware/cookies_test.rb
index bbb7627be9b01..7a1a0083b1e1f 100644
--- a/railties/test/application/middleware/cookies_test.rb
+++ b/railties/test/application/middleware/cookies_test.rb
@@ -10,7 +10,6 @@ def new_app
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf("#{app_path}/config/environments")
     end
 
diff --git a/railties/test/application/middleware/exceptions_test.rb b/railties/test/application/middleware/exceptions_test.rb
index 639b01b5626a6..44c0215341398 100644
--- a/railties/test/application/middleware/exceptions_test.rb
+++ b/railties/test/application/middleware/exceptions_test.rb
@@ -8,7 +8,6 @@ class MiddlewareExceptionsTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/middleware/sendfile_test.rb b/railties/test/application/middleware/sendfile_test.rb
index be86f1a3b8080..18e23ca17baa4 100644
--- a/railties/test/application/middleware/sendfile_test.rb
+++ b/railties/test/application/middleware/sendfile_test.rb
@@ -6,7 +6,6 @@ class SendfileTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
diff --git a/railties/test/application/middleware/session_test.rb b/railties/test/application/middleware/session_test.rb
index 85e7761727189..764a12f17fe71 100644
--- a/railties/test/application/middleware/session_test.rb
+++ b/railties/test/application/middleware/session_test.rb
@@ -8,7 +8,6 @@ class MiddlewareSessionTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 7a86a96e19a34..23699cae74ba8 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -6,7 +6,6 @@ class MiddlewareTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf "#{app_path}/config/environments"
     end
 
diff --git a/railties/test/application/multiple_applications_test.rb b/railties/test/application/multiple_applications_test.rb
index f2770a9cb4cfd..f9628fe5a89f7 100644
--- a/railties/test/application/multiple_applications_test.rb
+++ b/railties/test/application/multiple_applications_test.rb
@@ -6,7 +6,6 @@ class MultipleApplicationsTest < ActiveSupport::TestCase
 
     def setup
       build_app(initializers: true)
-      boot_rails
       require "#{rails_root}/config/environment"
       Rails.application.config.some_setting = 'something_or_other'
     end
diff --git a/railties/test/application/paths_test.rb b/railties/test/application/paths_test.rb
index 4029984ce9046..8eb1d42b33c55 100644
--- a/railties/test/application/paths_test.rb
+++ b/railties/test/application/paths_test.rb
@@ -6,7 +6,6 @@ class PathsTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf("#{app_path}/config/environments")
       app_file "config/environments/development.rb", ""
       add_to_config <<-RUBY
diff --git a/railties/test/application/rackup_test.rb b/railties/test/application/rackup_test.rb
index 49ac9fc66c86e..9fdd2d6bd9620 100644
--- a/railties/test/application/rackup_test.rb
+++ b/railties/test/application/rackup_test.rb
@@ -12,7 +12,6 @@ def rackup
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/rake/dbs_test.rb b/railties/test/application/rake/dbs_test.rb
index cee9db5535903..f9bf670c5a329 100644
--- a/railties/test/application/rake/dbs_test.rb
+++ b/railties/test/application/rake/dbs_test.rb
@@ -8,7 +8,6 @@ class RakeDbsTest < ActiveSupport::TestCase
 
       def setup
         build_app
-        boot_rails
         FileUtils.rm_rf("#{app_path}/config/environments")
       end
 
diff --git a/railties/test/application/rake/framework_test.rb b/railties/test/application/rake/framework_test.rb
index ec57af79f638c..04e54b2c70a5e 100644
--- a/railties/test/application/rake/framework_test.rb
+++ b/railties/test/application/rake/framework_test.rb
@@ -8,7 +8,6 @@ class FrameworkTest < ActiveSupport::TestCase
 
       def setup
         build_app
-        boot_rails
         FileUtils.rm_rf("#{app_path}/config/environments")
       end
 
diff --git a/railties/test/application/rake/migrations_test.rb b/railties/test/application/rake/migrations_test.rb
index 7e2519ae5acb3..35f14a9b84846 100644
--- a/railties/test/application/rake/migrations_test.rb
+++ b/railties/test/application/rake/migrations_test.rb
@@ -5,7 +5,6 @@ module RakeTests
     class RakeMigrationsTest < ActiveSupport::TestCase
       def setup
         build_app
-        boot_rails
         FileUtils.rm_rf("#{app_path}/config/environments")
       end
 
diff --git a/railties/test/application/rake/notes_test.rb b/railties/test/application/rake/notes_test.rb
index 50def9beb02ce..e8c13c7157e40 100644
--- a/railties/test/application/rake/notes_test.rb
+++ b/railties/test/application/rake/notes_test.rb
@@ -149,7 +149,6 @@ def load_tasks
       end
 
       def boot_rails
-        super
         require "#{app_path}/config/environment"
       end
     end
diff --git a/railties/test/application/rake/restart_test.rb b/railties/test/application/rake/restart_test.rb
index 30f662a9be287..78769a6de5ee4 100644
--- a/railties/test/application/rake/restart_test.rb
+++ b/railties/test/application/rake/restart_test.rb
@@ -7,7 +7,6 @@ class RakeRestartTest < ActiveSupport::TestCase
 
       def setup
         build_app
-        boot_rails
       end
 
       def teardown
diff --git a/railties/test/application/rake_test.rb b/railties/test/application/rake_test.rb
index badb9ecdd61c9..45ea506226915 100644
--- a/railties/test/application/rake_test.rb
+++ b/railties/test/application/rake_test.rb
@@ -7,7 +7,6 @@ class RakeTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/rendering_test.rb b/railties/test/application/rendering_test.rb
index b01febd768921..9514547608b37 100644
--- a/railties/test/application/rendering_test.rb
+++ b/railties/test/application/rendering_test.rb
@@ -8,7 +8,6 @@ class RoutingTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/routing_test.rb b/railties/test/application/routing_test.rb
index 93847c7aa9e9b..8e7df71880ed1 100644
--- a/railties/test/application/routing_test.rb
+++ b/railties/test/application/routing_test.rb
@@ -8,7 +8,6 @@ class RoutingTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/runner_test.rb b/railties/test/application/runner_test.rb
index 9f15ce5e85074..84d90cc6d7d86 100644
--- a/railties/test/application/runner_test.rb
+++ b/railties/test/application/runner_test.rb
@@ -8,7 +8,6 @@ class RunnerTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
 
       # Lets create a model so we have something to play with
       app_file "app/models/user.rb", <<-MODEL
@@ -76,12 +75,12 @@ def test_default_environment
 
     def test_runner_detects_syntax_errors
       Dir.chdir(app_path) { `bin/rails runner "puts 'hello world" 2>&1` }
-      refute $?.success? 
+      refute $?.success?
     end
 
     def test_runner_detects_bad_script_name
       Dir.chdir(app_path) { `bin/rails runner "iuiqwiourowe" 2>&1` }
-      refute $?.success? 
+      refute $?.success?
     end
 
     def test_environment_with_rails_env
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index 85b003fce9a40..1e9d35287e499 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -6,7 +6,6 @@ class TestTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index 894e18cb3911e..6700323199270 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -9,7 +9,6 @@ def app
     end
 
     test "it works" do
-      boot_rails
       require "rails"
       require "action_controller/railtie"
       require "action_view/railtie"
@@ -44,7 +43,6 @@ def index
     end
 
     def test_routes_know_the_relative_root
-      boot_rails
       require "rails"
       require "action_controller/railtie"
       require "action_view/railtie"
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index e427614dfad0f..032c245c3aa20 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -310,9 +310,6 @@ def use_frameworks(arr)
 
       $:.reject! {|path| path =~ %r'/(#{to_remove.join('|')})/' }
     end
-
-    def boot_rails
-    end
   end
 end
 
diff --git a/railties/test/railties/engine_test.rb b/railties/test/railties/engine_test.rb
index fb8a7656d053d..0eaa5bc35119f 100644
--- a/railties/test/railties/engine_test.rb
+++ b/railties/test/railties/engine_test.rb
@@ -28,7 +28,6 @@ def teardown
     end
 
     def boot_rails
-      super
       require "#{app_path}/config/environment"
     end
 
diff --git a/railties/test/railties/mounted_engine_test.rb b/railties/test/railties/mounted_engine_test.rb
index fb2071c7c3df2..70789d86e2378 100644
--- a/railties/test/railties/mounted_engine_test.rb
+++ b/railties/test/railties/mounted_engine_test.rb
@@ -179,8 +179,6 @@ def application_polymorphic_path
           end
         end
       RUBY
-
-      boot_rails
     end
 
     def teardown
diff --git a/railties/test/railties/railtie_test.rb b/railties/test/railties/railtie_test.rb
index 5042d628cf8fb..4ae6d8fa044c9 100644
--- a/railties/test/railties/railtie_test.rb
+++ b/railties/test/railties/railtie_test.rb
@@ -6,7 +6,6 @@ class RailtieTest < ActiveSupport::TestCase
 
     def setup
       build_app
-      boot_rails
       FileUtils.rm_rf("#{app_path}/config/environments")
       require "rails/all"
     end