Use require_relative instead of require with full path

actioncable/README.md

@@ -409,7 +409,7 @@ application. The recommended basic setup is as follows:
 
 ```ruby
 # cable/config.ru
-require ::File.expand_path('../config/environment', __dir__)
+require_relative '../config/environment'
 Rails.application.eager_load!
 
 run ActionCable.server

actioncable/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

actioncable/test/subscription_adapter/async_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require_relative "./common"
+require_relative "common"
 
 class AsyncAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest

actioncable/test/subscription_adapter/evented_redis_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
-require_relative "./common"
-require_relative "./channel_prefix"
+require_relative "common"
+require_relative "channel_prefix"
 
 class EventedRedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest

actioncable/test/subscription_adapter/inline_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require_relative "./common"
+require_relative "common"
 
 class InlineAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest

actioncable/test/subscription_adapter/postgresql_test.rb

@@ -1,5 +1,5 @@
 require "test_helper"
-require_relative "./common"
+require_relative "common"
 
 require "active_record"
 

actioncable/test/subscription_adapter/redis_test.rb

@@ -1,6 +1,6 @@
 require "test_helper"
-require_relative "./common"
-require_relative "./channel_prefix"
+require_relative "common"
+require_relative "channel_prefix"
 
 class RedisAdapterTest < ActionCable::TestCase
   include CommonSubscriptionAdapterTest

actionmailer/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

actionpack/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

actionview/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

activejob/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

activemodel/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

activerecord/Rakefile

@@ -1,7 +1,7 @@
 require "rake/testtask"
 
-require File.expand_path("test/config", __dir__)
-require File.expand_path("test/support/config", __dir__)
+require_relative "test/config"
+require_relative "test/support/config"
 
 def run_without_aborting(*tasks)
   errors = []

activerecord/bin/test

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"
 
 module Minitest
   def self.plugin_active_record_options(opts, options)

activerecord/test/cases/errors_test.rb

@@ -1,4 +1,4 @@
-require_relative "../cases/helper"
+require "cases/helper"
 
 class ErrorsTest < ActiveRecord::TestCase
   def test_can_be_instantiated_with_no_args

activesupport/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

railties/bin/test

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
 
 COMPONENT_ROOT = File.expand_path("..", __dir__)
-require File.expand_path("../tools/test", COMPONENT_ROOT)
+require_relative "../../tools/test"

railties/lib/rails/generators/rails/app/templates/test/test_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../config/environment', __dir__)
+require_relative '../config/environment'
 require 'rails/test_help'
 
 class ActiveSupport::TestCase

railties/lib/rails/generators/rails/plugin/templates/test/test_helper.rb

@@ -1,4 +1,4 @@
-require File.expand_path("../<%= options[:dummy_path] -%>/config/environment.rb", __dir__)
+require_relative "<%= File.join('..', options[:dummy_path], 'config/environment') -%>"
 <% unless options[:skip_active_record] -%>
 ActiveRecord::Migrator.migrations_paths = [File.expand_path("../<%= options[:dummy_path] -%>/db/migrate", __dir__)]
 <% if options[:mountable] -%>

railties/test/generators/plugin_generator_test.rb

@@ -63,7 +63,7 @@ def test_generating_without_options
     assert_no_file "config/routes.rb"
     assert_no_file "app/assets/config/bukkits_manifest.js"
     assert_file "test/test_helper.rb" do |content|
-      assert_match(/require.+test\/dummy\/config\/environment/, content)
+      assert_match(/require_relative.+test\/dummy\/config\/environment/, content)
       assert_match(/ActiveRecord::Migrator\.migrations_paths.+test\/dummy\/db\/migrate/, content)
       assert_match(/Minitest\.backtrace_filter = Minitest::BacktraceFilter\.new/, content)
       assert_match(/Rails::TestUnitReporter\.executable = 'bin\/test'/, content)
@@ -438,7 +438,7 @@ def test_passing_dummy_path_as_a_parameter
     assert_file "spec/dummy/config/application.rb"
     assert_no_file "test/dummy"
     assert_file "test/test_helper.rb" do |content|
-      assert_match(/require.+spec\/dummy\/config\/environment/, content)
+      assert_match(/require_relative.+spec\/dummy\/config\/environment/, content)
       assert_match(/ActiveRecord::Migrator\.migrations_paths.+spec\/dummy\/db\/migrate/, content)
     end
   end
@@ -449,7 +449,7 @@ def test_creating_dummy_application_with_different_name
     assert_file "spec/fake/config/application.rb"
     assert_no_file "test/dummy"
     assert_file "test/test_helper.rb" do |content|
-      assert_match(/require.+spec\/fake\/config\/environment/, content)
+      assert_match(/require_relative.+spec\/fake\/config\/environment/, content)
       assert_match(/ActiveRecord::Migrator\.migrations_paths.+spec\/fake\/db\/migrate/, content)
     end
   end

railties/test/generators_test.rb

@@ -233,7 +233,7 @@ def test_source_paths_for_not_namespaced_generators
   end
 
   def test_usage_with_embedded_ruby
-    require File.expand_path("fixtures/lib/generators/usage_template/usage_template_generator", __dir__)
+    require_relative "fixtures/lib/generators/usage_template/usage_template_generator"
     output = capture(:stdout) { Rails::Generators.invoke :usage_template, ["--help"] }
     assert_match(/:: 2 ::/, output)
   end