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

---
 actionmailer/Gemfile               | 10 ----------
 actionmailer/test/abstract_unit.rb | 14 +++++++-------
 2 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 actionmailer/Gemfile

(limited to 'actionmailer')

diff --git a/actionmailer/Gemfile b/actionmailer/Gemfile
deleted file mode 100644
index 430b32e8ca..0000000000
--- a/actionmailer/Gemfile
+++ /dev/null
@@ -1,10 +0,0 @@
-Gem.sources.each { |uri| source uri }
-sibling = "#{File.dirname(__FILE__)}/.."
-
-gem "activesupport", "3.0.pre", :vendored_at => "#{sibling}/activesupport"
-gem "activemodel", "3.0.pre", :vendored_at => "#{sibling}/activemodel"
-gem "actionpack", "3.0.pre", :vendored_at => "#{sibling}/actionpack"
-gem "rack-mount", :git => "git://github.com/josh/rack-mount.git"
-gem "mocha"
-
-#disable_system_gems
diff --git a/actionmailer/test/abstract_unit.rb b/actionmailer/test/abstract_unit.rb
index 7843623996..fcbaa9e186 100644
--- a/actionmailer/test/abstract_unit.rb
+++ b/actionmailer/test/abstract_unit.rb
@@ -1,15 +1,15 @@
-bundled = "#{File.dirname(__FILE__)}/../vendor/gems/environment"
-if File.exist?("#{bundled}.rb")
-  require bundled
-else
-  $:.unshift "#{File.dirname(__FILE__)}/../../activesupport/lib"
-  $:.unshift "#{File.dirname(__FILE__)}/../../actionpack/lib"
+root = File.expand_path('../../..', __FILE__)
+begin
+  require "#{root}/vendor/gems/environment"
+rescue LoadError
+  $:.unshift("#{root}/activesupport/lib")
+  $:.unshift("#{root}/actionpack/lib")
+  $:.unshift("#{root}/actionmailer/lib")
 end
 
 require 'rubygems'
 require 'test/unit'
 
-$:.unshift "#{File.dirname(__FILE__)}/../lib"
 require 'action_mailer'
 require 'action_mailer/test_case'
 
-- 
cgit v1.2.3