test/test_helper.rb in friendly_id-3.0.6 vs test/test_helper.rb in friendly_id-3.1.0.pre

@@ -1,16 +1,15 @@
+$:.unshift File.expand_path("../lib", File.dirname(__FILE__))
+$:.unshift File.expand_path(File.dirname(__FILE__))
+$:.uniq!
+
 $KCODE = "UTF8" if RUBY_VERSION < "1.9"
 $VERBOSE = false
-begin
-  require File.expand_path('../../.bundle/environment', __FILE__)
-rescue LoadError
-  # Fall back on doing an unlocked resolve at runtime.
-  require "rubygems"
-  require "bundler"
-  Bundler.setup
-end
+require "rubygems"
+require "bundler"
+Bundler.setup
 require "test/unit"
 require "mocha"
 require "active_support"
 # require "ruby-debug"
-require File.expand_path("../../lib/friendly_id", __FILE__)
-require File.expand_path("../../lib/friendly_id/test", __FILE__)
+require "friendly_id"
+require "friendly_id/test"