From 7b282028bddd7fb81644b3427c2d83fa8fe23e54 Mon Sep 17 00:00:00 2001
From: Chris Wanstrath <chris@ozmm.org>
Date: Mon, 16 May 2011 13:28:14 -0700
Subject: [PATCH] ensure we're using bundler's test env

---
 test/test_helper.rb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 9d0acafe0..49d9d38da 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,9 +1,12 @@
+require 'rubygems'
+require 'bundler'
+Bundler.setup(:default, :test)
+Bundler.require(:default, :test)
+
 dir = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift dir + '/../lib'
 $TESTING = true
 require 'test/unit'
-require 'rubygems'
-require 'resque'
 
 begin
   require 'leftright'