Merge pull request travisjeffery#162 from grosser/grosser/setup

simplify test setup

Author: Travis Jeffery

test/test_helper.rb

@@ -1,14 +1,9 @@
-require 'rubygems'
 require 'bundler/setup'
 require 'minitest/autorun'
 
 $VERBOSE = true # enable ruby warnings
 
-begin
-  require 'mocha/setup'
-rescue LoadError
-  require 'mocha'
-end
+require 'mocha/setup'
 
 class Minitest::Unit::TestCase
   private

test/time_stack_item_test.rb

@@ -1,6 +1,6 @@
 require 'date'
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
 require 'active_support/all'
 

test/timecop_date_parse_test.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
 class TestTimecop < Minitest::Unit::TestCase
   def setup

test/timecop_test.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
 class TestTimecop < Minitest::Unit::TestCase
   def teardown

test/timecop_with_active_support_test.rb

@@ -1,8 +1,10 @@
 require 'date'
+
+require 'bundler/setup'
 require 'active_support/all'
 
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
 class TestTimecopWithActiveSupport < Minitest::Unit::TestCase
   def teardown

test/timecop_without_date_but_with_time_test.rb

@@ -1,10 +1,8 @@
-require File.join(File.dirname(__FILE__), "test_helper")
+require_relative "test_helper"
+require "time"
 
 class TestTimecopWithoutDateButWithTime < Minitest::Unit::TestCase
-  TIMECOP_LIB = File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
-
   def test_loads_properly_when_time_is_required_instead_of_date
-    require "time"
-    require TIMECOP_LIB
+    require 'timecop'
   end
 end

test/timecop_without_date_test.rb

@@ -1,5 +1,5 @@
-require File.join(File.dirname(__FILE__), "test_helper")
-require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
+require_relative "test_helper"
+require 'timecop'
 
 class TestTimecopWithoutDate < Minitest::Unit::TestCase