Merge pull request #25652 from prathamesh-sonpatki/rm-boot-rails

Remove unused boot_rails method and it's usage
rails · Jul 8, 2016 · c62ac07 · c62ac07
2 parents 8e74f71 + d934278
commit c62ac07
Show file tree

Hide file tree

Showing 38 changed files with 3 additions and 46 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -161,7 +161,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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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