test/helper.rb in fastly-1.01 vs test/helper.rb in fastly-1.1.0

@@ -1,15 +1,30 @@
+require 'common'
 require 'fastly'
-require File.expand_path(File.dirname(__FILE__) + '/common')
+require 'minitest/autorun'
 
+# Accommodate a more modern version of Minitest compared to the stdlib
+if defined? Minitest::Test
+  class Fastly::TestCase < Minitest::Test
+  end
+else
+  class Fastly::TestCase < MiniTest::Unit::TestCase
+  end
+end
+
+class Fastly::TestCase
+  # Map inconsistency between Test::Unit and Minitest
+  alias :assert_raise :assert_raises
+end
+
 def login_opts(mode=:full)
   opts = { }
   [:url,:port].each do |what|
     key = "FASTLY_TEST_BASE_#{what.to_s.upcase}"
     opts["base_#{what}".to_sym] = ENV[key] if ENV.has_key?(key)
   end
-  
+
   required = :full == mode ? [:user, :name, :password, :customer] : [:api_key, :customer]
   required.each do |what|
       key ="FASTLY_TEST_#{what.to_s.upcase}"
       unless ENV.has_key?(key)
         warn "You haven't set the environment variable #{key}"
@@ -20,6 +35,6 @@
   opts
 end
 
 def get_rand
   "#{Process.pid}-#{Time.now.to_i}-#{Kernel.rand(1000)}"
-end
\ No newline at end of file
+end