test/helper.rb in fastly-1.1.4 vs test/helper.rb in fastly-1.1.5

@@ -1,40 +1,31 @@
 require 'common'
 require 'fastly'
 require 'minitest/autorun'
+require 'pry'
 
-# 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
+class Fastly
+  class TestCase < Minitest::Test; 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|
+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)
+    opts["base_#{what}".to_sym] = ENV[key] if ENV.key?(key)
   end
 
-  required = :full == mode ? [:user, :name, :password, :customer] : [:api_key, :customer]
+  required = :full == mode ? [:user, :password] : [:api_key]
   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}"
-        exit(-1)
-      end
-      opts[what] = ENV[key]
+    key = "FASTLY_TEST_#{what.to_s.upcase}"
+    unless ENV.key?(key)
+      warn "You haven't set the environment variable #{key}"
+      exit(-1)
+    end
+    opts[what] = ENV[key]
   end
   opts
 end
 
-def get_rand
+def random_string
   "#{Process.pid}-#{Time.now.to_i}-#{Kernel.rand(1000)}"
 end