From 4f6d6f7031a88b647814fc0154e6b69b636dc912 Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Tue, 20 Oct 2009 16:33:54 -0700
Subject: Have all the tests running off a single Gemfile

---
 activemodel/Gemfile              | 12 ------------
 activemodel/test/cases/helper.rb | 13 ++++++-------
 2 files changed, 6 insertions(+), 19 deletions(-)
 delete mode 100644 activemodel/Gemfile

(limited to 'activemodel')

diff --git a/activemodel/Gemfile b/activemodel/Gemfile
deleted file mode 100644
index a192fdaf82..0000000000
--- a/activemodel/Gemfile
+++ /dev/null
@@ -1,12 +0,0 @@
-rails_root = Pathname.new(File.dirname(__FILE__)).join("..")
-
-Gem.sources.each { |uri| source uri }
-
-gem "activesupport", "3.0.pre", :vendored_at => rails_root.join("activesupport")
-gem "arel", :git => "git://github.com/rails/arel.git"
-
-only :test do
-  gem "sqlite3-ruby"
-end
-
-disable_system_gems
diff --git a/activemodel/test/cases/helper.rb b/activemodel/test/cases/helper.rb
index e54c85938b..49783c2735 100644
--- a/activemodel/test/cases/helper.rb
+++ b/activemodel/test/cases/helper.rb
@@ -1,13 +1,12 @@
-bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
-if File.exist?("#{bundled}.rb")
-  require bundled
-else
-  $:.unshift(File.dirname(__FILE__) + '/../../lib')
-  $:.unshift(File.dirname(__FILE__) + '/../../../activesupport/lib')
+root = File.expand_path('../../../..', __FILE__)
+begin
+  require "#{root}/vendor/gems/environment"
+rescue LoadError
+  $:.unshift("#{root}/activesupport/lib")
+  $:.unshift("#{root}/activemodel/lib")
 end
 
 require 'config'
-
 require 'active_model'
 
 # Show backtraces for deprecated behavior for quicker cleanup.
-- 
cgit v1.2.3