test/test_helper.rb in geocerts-0.0.25 vs test/test_helper.rb in geocerts-1.0.0

@@ -1,19 +1,19 @@
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'rubygems'
+$:.unshift(File.expand_path('..', __FILE__))
+$:.unshift(File.expand_path('../../lib', __FILE__))
 
-require 'geo_certs'
+require 'bundler'
+Bundler.setup
 
-require 'test/unit'
-require 'uri'
+require 'geo_certs'
 require 'shoulda'
+require 'mocha'
 require 'factory_girl'
 require 'factories'
-require 'mocha'
+require 'vcr'
 
 # Load any initializers for testing.
-Dir[File.dirname(__FILE__) + '/config/initializers/**/*.rb'].sort.each do |initializer|
+Dir[File.expand_path('../config/initializers/**/*.rb', __FILE__)].sort.each do |initializer|
   require initializer
 end
 
 class Test::Unit::TestCase