aboutsummaryrefslogtreecommitdiffstats
path: root/activeresource
diff options
context:
space:
mode:
authorYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-10-20 16:33:54 -0700
committerYehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>2009-10-20 16:34:44 -0700
commit4f6d6f7031a88b647814fc0154e6b69b636dc912 (patch)
tree9752430c715e0b5d32713882c267d41554710246 /activeresource
parenta5c82a9dfb6d63bf90a3378da0b71d6ea592d7e3 (diff)
downloadrails-4f6d6f7031a88b647814fc0154e6b69b636dc912.tar.gz
rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.tar.bz2
rails-4f6d6f7031a88b647814fc0154e6b69b636dc912.zip
Have all the tests running off a single Gemfile
Diffstat (limited to 'activeresource')
-rw-r--r--activeresource/test/abstract_unit.rb10
1 files changed, 8 insertions, 2 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb
index 6a33040243..ee12f785b5 100644
--- a/activeresource/test/abstract_unit.rb
+++ b/activeresource/test/abstract_unit.rb
@@ -1,9 +1,15 @@
+root = File.expand_path('../../..', __FILE__)
+begin
+ require "#{root}/vendor/gems/environment"
+rescue LoadError
+ $:.unshift("#{root}/activesupport/lib")
+ $:.unshift("#{root}/activeresource/lib")
+end
+
require 'rubygems'
require 'test/unit'
require 'active_support'
require 'active_support/test_case'
-
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
require 'active_resource'
$:.unshift "#{File.dirname(__FILE__)}/../test"