TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Avoid adding component lib/ to load path multiple times

Browse Source
This commit is contained in:
Joshua Peek 2009-11-09 23:28:36 -06:00
parent 23229d5ad4
commit 11e798ae0f
6 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionmailer/test/abstract_unit.rb
View File

@ -4,9 +4,11 @@
rescue LoadError rescue LoadError
$:.unshift("#{root}/activesupport/lib") $:.unshift("#{root}/activesupport/lib")
$:.unshift("#{root}/actionpack/lib") $:.unshift("#{root}/actionpack/lib")
$:.unshift("#{root}/actionmailer/lib")
end end
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
require 'rubygems' require 'rubygems'
require 'test/unit' require 'test/unit'

4
actionpack/test/abstract_unit.rb
View File

@ -6,7 +6,9 @@
$:.unshift "#{root}/activemodel/lib" $:.unshift "#{root}/activemodel/lib"
end end
$:.unshift(File.dirname(__FILE__) + '/../lib') lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
$:.unshift(File.dirname(__FILE__) + '/lib') $:.unshift(File.dirname(__FILE__) + '/lib')
$:.unshift(File.dirname(__FILE__) + '/fixtures/helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/helpers')
$:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers') $:.unshift(File.dirname(__FILE__) + '/fixtures/alternate_helpers')

4
activemodel/test/cases/helper.rb
View File

@ -3,9 +3,11 @@
require "#{root}/vendor/gems/environment" require "#{root}/vendor/gems/environment"
rescue LoadError rescue LoadError
$:.unshift("#{root}/activesupport/lib") $:.unshift("#{root}/activesupport/lib")
$:.unshift("#{root}/activemodel/lib")
end end
lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
require 'config' require 'config'
require 'active_model' require 'active_model'

4
activerecord/test/cases/helper.rb
View File

@ -3,9 +3,11 @@
require "#{root}/vendor/gems/environment" require "#{root}/vendor/gems/environment"
rescue LoadError rescue LoadError
$:.unshift("#{root}/activesupport/lib") $:.unshift("#{root}/activesupport/lib")
$:.unshift("#{root}/activerecord/lib")
end end
lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
require 'config' require 'config'
require 'rubygems' require 'rubygems'

4
activeresource/test/abstract_unit.rb
View File

@ -3,9 +3,11 @@
require "#{root}/vendor/gems/environment" require "#{root}/vendor/gems/environment"
rescue LoadError rescue LoadError
$:.unshift("#{root}/activesupport/lib") $:.unshift("#{root}/activesupport/lib")
$:.unshift("#{root}/activeresource/lib")
end end
lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
require 'rubygems' require 'rubygems'
require 'test/unit' require 'test/unit'
require 'active_support' require 'active_support'

3
activesupport/test/abstract_unit.rb
View File

@ -5,7 +5,8 @@
rescue LoadError rescue LoadError
end end
$:.unshift(File.dirname(__FILE__) + '/../lib') lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
require 'test/unit' require 'test/unit'
require 'mocha' require 'mocha'