Remove load_paths file

kabelak · Feb 27, 2016 · 2abcdfd · 2abcdfd
1 parent 3174b5f
commit 2abcdfd
Show file tree

Hide file tree

Showing 15 changed files with 5 additions and 43 deletions.
diff --git a/actioncable/test/test_helper.rb b/actioncable/test/test_helper.rb
@@ -1,9 +1,6 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
 require 'action_cable'
 require 'active_support/testing/autorun'
 
-
 require 'puma'
 
 require 'mocha/setup'

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
@@ -1,4 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
 require 'active_support/core_ext/kernel/reporting'
 
 # These are the normal settings that will be set up by Railties

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -1,5 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
 $:.unshift(File.dirname(__FILE__) + '/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')

diff --git a/actionview/test/abstract_unit.rb b/actionview/test/abstract_unit.rb
@@ -1,5 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
 $:.unshift(File.dirname(__FILE__) + '/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')

diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
@@ -1,5 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
-
 require 'active_job'
 require 'support/job_buffer'
 

diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
@@ -1,5 +1,3 @@
-require File.expand_path('../../../../load_paths', __FILE__)
-
 require 'active_model'
 require 'active_support/core_ext/string/access'
 

diff --git a/activerecord/examples/performance.rb b/activerecord/examples/performance.rb
@@ -1,4 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
 require "active_record"
 require 'benchmark/ips'
 

diff --git a/activerecord/examples/simple.rb b/activerecord/examples/simple.rb
@@ -1,4 +1,3 @@
-require File.expand_path('../../../load_paths', __FILE__)
 require 'active_record'
 
 class Person < ActiveRecord::Base

diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb
@@ -1,5 +1,3 @@
-require File.expand_path('../../../../load_paths', __FILE__)
-
 require 'config'
 
 require 'active_support/testing/autorun'

diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
@@ -1,12 +1,5 @@
 ORIG_ARGV = ARGV.dup
 
-begin
-  old, $VERBOSE = $VERBOSE, nil
-  require File.expand_path('../../../load_paths', __FILE__)
-ensure
-  $VERBOSE = old
-end
-
 require 'active_support/core_ext/kernel/reporting'
 
 silence_warnings do

diff --git a/load_paths.rb b/load_paths.rb
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb
@@ -1,7 +1,5 @@
 ENV["RAILS_ENV"] ||= "test"
 
-require File.expand_path("../../../load_paths", __FILE__)
-
 require 'stringio'
 require 'active_support/testing/autorun'
 require 'active_support/testing/stream'

diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
@@ -311,10 +311,6 @@ def use_frameworks(arr)
     end
 
     def boot_rails
-      # FIXME: shush Sass warning spam, not relevant to testing Railties
-      Kernel.silence_warnings do
-        require File.expand_path('../../../../load_paths', __FILE__)
-      end
     end
   end
 end
@@ -336,12 +332,8 @@ class ActiveSupport::TestCase
   FileUtils.rm_rf(app_template_path)
   FileUtils.mkdir(app_template_path)
 
-  environment = File.expand_path('../../../../load_paths', __FILE__)
-  require_environment = "-r #{environment}"
-
-  `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-gemfile --skip-listen --no-rc`
+  `#{Gem.ruby} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails new #{app_template_path} --skip-gemfile --skip-listen --no-rc`
   File.open("#{app_template_path}/config/boot.rb", 'w') do |f|
-    f.puts "require '#{environment}'"
     f.puts "require 'rails/all'"
   end
 end unless defined?(RAILS_ISOLATED_ENGINE)
diff --git a/railties/test/railties/generators_test.rb b/railties/test/railties/generators_test.rb
@@ -26,11 +26,7 @@ def bundled_rails(cmd)
     end
 
     def rails(cmd)
-      environment = File.expand_path('../../../../load_paths', __FILE__)
-      if File.exist?("#{environment}.rb")
-        require_environment = "-r #{environment}"
-      end
-      `#{Gem.ruby} #{require_environment} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails #{cmd}`
+      `#{Gem.ruby} #{RAILS_FRAMEWORK_ROOT}/railties/exe/rails #{cmd}`
     end
 
     def build_engine(is_mountable=false)

diff --git a/tools/console b/tools/console
@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
-require File.expand_path('../../load_paths', __FILE__)
+require 'bundler'
+Bundler.setup
+
 require 'rails/all'
 require 'active_support/all'
 require 'irb'