aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2010-02-28 18:29:34 -0600
committerJoshua Peek <josh@joshpeek.com>2010-02-28 18:29:34 -0600
commit30446f7b29b1803ea24f9c6d9ed93b16dcbf7431 (patch)
tree4424774fbf3bb7b1876e702f64d3dc1e9f7cdf0a
parent5cc17da8946abbaa86a4d9c91dcd4b05a289493f (diff)
downloadrails-30446f7b29b1803ea24f9c6d9ed93b16dcbf7431.tar.gz
rails-30446f7b29b1803ea24f9c6d9ed93b16dcbf7431.tar.bz2
rails-30446f7b29b1803ea24f9c6d9ed93b16dcbf7431.zip
correct activeresource load path
-rw-r--r--activeresource/test/abstract_unit.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 1af535e811..fcb770d612 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -1,12 +1,14 @@
require File.expand_path('../../../load_paths', __FILE__)
+lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+$:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
+
require 'rubygems'
require 'test/unit'
require 'active_resource'
require 'active_support'
require 'active_support/test_case'
-$:.unshift "#{File.dirname(__FILE__)}/../test"
require 'setter_trap'
require 'logger'