generator_test_helper.rb in sprout-1.1.7.pre

- old
+ new

@@ -1,16 +1,19 @@
 require "rubygems"
 require "bundler"
+Bundler.require :default, :development
 
-Bundler.setup :default, :development
-
-require 'sprout'
 # These require statments *must* be in this order:
 # http://bit.ly/bCC0Ew
 # Somewhat surprised they're not being required by Bundler...
 require 'shoulda'
 require 'mocha'
 
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
-$:.unshift File.expand_path(File.join(File.dirname(__FILE__), '..'))
+lib = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
+$:.unshift lib unless $:.include? lib
 
-require 'sprout/test/sprout_test_case'
+test = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+$:.unshift test unless $:.include? test
+
+require 'sprout'
+require 'sprout/test_helper'
+