aboutsummaryrefslogtreecommitdiffstats
path: root/activemodel
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-11-09 23:28:36 -0600
committerJoshua Peek <josh@joshpeek.com>2009-11-09 23:28:36 -0600
commit11e798ae0f2f46498811282756c9d21df3d4b523 (patch)
tree460a4afcd2b25cede89f2e2c785244dbcc97656f /activemodel
parent23229d5ad4cf1c222d4d8c4561fbdff284f9bdee (diff)
downloadrails-11e798ae0f2f46498811282756c9d21df3d4b523.tar.gz
rails-11e798ae0f2f46498811282756c9d21df3d4b523.tar.bz2
rails-11e798ae0f2f46498811282756c9d21df3d4b523.zip
Avoid adding component lib/ to load path multiple times
Diffstat (limited to 'activemodel')
-rw-r--r--activemodel/test/cases/helper.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index 49783c2735..c1a3f6a4a7 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -3,9 +3,11 @@ begin
require "#{root}/vendor/gems/environment"
rescue LoadError
$:.unshift("#{root}/activesupport/lib")
- $:.unshift("#{root}/activemodel/lib")
end
+lib = File.expand_path("#{File.dirname(__FILE__)}/../../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
require 'config'
require 'active_model'