From 11e798ae0f2f46498811282756c9d21df3d4b523 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Mon, 9 Nov 2009 23:28:36 -0600
Subject: Avoid adding component lib/ to load path multiple times

---
 activemodel/test/cases/helper.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'activemodel/test')

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'
 
-- 
cgit v1.2.3