Remove useless load path modifications

rails · May 11, 2012 · 36dd185 · 36dd185
1 parent a00228c
commit 36dd185
Show file tree

Hide file tree

Showing 12 changed files with 4 additions and 38 deletions.
diff --git a/actionmailer/lib/action_mailer.rb b/actionmailer/lib/action_mailer.rb
@@ -21,9 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-actionpack_path = File.expand_path('../../../actionpack/lib', __FILE__)
-$:.unshift(actionpack_path) if File.directory?(actionpack_path) && !$:.include?(actionpack_path)
-
 require 'abstract_controller'
 require 'action_view'
 require 'action_mailer/version'

diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
@@ -8,9 +8,6 @@
   Encoding.default_external = "UTF-8"
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
 require 'minitest/autorun'
 require 'action_mailer'
 require 'action_mailer/test_case'

diff --git a/actionpack/lib/abstract_controller.rb b/actionpack/lib/abstract_controller.rb
@@ -1,6 +1,3 @@
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
 require 'action_pack'
 require 'active_support/concern'
 require 'active_support/dependencies/autoload'

diff --git a/actionpack/lib/action_dispatch.rb b/actionpack/lib/action_dispatch.rb
@@ -21,12 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
-
-activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
-$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
-
 require 'active_support'
 require 'active_support/dependencies/autoload'
 require 'active_support/core_ext/module/attribute_accessors'

diff --git a/actionpack/test/abstract_unit.rb b/actionpack/test/abstract_unit.rb
@@ -1,11 +1,5 @@
 require File.expand_path('../../../load_paths', __FILE__)
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
-activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__)
-$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path)
-
 $:.unshift(File.dirname(__FILE__) + '/lib')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
 $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')

diff --git a/actionpack/test/ts_isolated.rb b/actionpack/test/ts_isolated.rb
@@ -1,6 +1,3 @@
-$:.unshift(File.dirname(__FILE__))
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-
 require 'minitest/autorun'
 require 'rbconfig'
 require 'abstract_unit'

diff --git a/activemodel/lib/active_model.rb b/activemodel/lib/active_model.rb
@@ -21,8 +21,6 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__)
-$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path)
 require 'active_support'
 require 'active_model/version'
 

diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
@@ -1,8 +1,5 @@
 require File.expand_path('../../../../load_paths', __FILE__)
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
 require 'config'
 require 'active_model'
 require 'active_support/core_ext/string/access'

diff --git a/activesupport/test/abstract_unit.rb b/activesupport/test/abstract_unit.rb
@@ -7,9 +7,6 @@
   $VERBOSE = old
 end
 
-lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
-$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
-
 require 'active_support/core_ext/kernel/reporting'
 require 'active_support/core_ext/string/encoding'
 

diff --git a/activesupport/test/ts_isolated.rb b/activesupport/test/ts_isolated.rb
@@ -1,5 +1,3 @@
-$:.unshift(File.dirname(__FILE__) + '/../../activesupport/lib')
-
 require 'minitest/autorun'
 require 'active_support/test_case'
 require 'rbconfig'

diff --git a/railties/Rakefile b/railties/Rakefile
@@ -20,7 +20,8 @@ namespace :test do
         'test',
         'lib',
         "#{File.dirname(__FILE__)}/../activesupport/lib",
-        "#{File.dirname(__FILE__)}/../actionpack/lib"
+        "#{File.dirname(__FILE__)}/../actionpack/lib",
+        "#{File.dirname(__FILE__)}/../activemodel/lib"
       ]
       ruby "-I#{dash_i.join ':'}", file
     end

diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
@@ -17,8 +17,8 @@
 
 # These files do not require any others and are needed
 # to run the tests
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/testing/isolation"
+require "active_support/testing/isolation"
-require "#{RAILS_FRAMEWORK_ROOT}/activesupport/lib/active_support/core_ext/kernel/reporting"
+require "active_support/core_ext/kernel/reporting"
 
 module TestHelpers
   module Paths
@@ -248,7 +248,6 @@ def controller(name, contents)
 
     def use_frameworks(arr)
       to_remove =  [:actionmailer,
-                    :activemodel,
                     :activerecord] - arr
       if to_remove.include? :activerecord
         remove_from_config "config.active_record.whitelist_attributes = true"