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

@@ -1,37 +1,37 @@
 require 'helper'
 
+# Admin-related tests
 class AdminTest < Fastly::TestCase
   def setup
-    opts = login_opts(:full).merge(:use_curb => false)
+    opts = login_opts(:full)
     begin
       @client = Fastly::Client.new(opts)
       @fastly = Fastly.new(opts)
-    rescue Exception => e
+    rescue => e
       warn e.inspect
       warn e.backtrace.join("\n")
       exit(-1)
     end
   end
 
   def test_creating_and_updating_customer
     return unless @fastly.current_user.can_do?(:admin)
-    customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{get_rand}")
-    email    = "fastly-ruby-test-#{get_rand}[e-mail]"
-    user     = @fastly.create_user(:login => email, :name => "New User")
+    customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{random_string}")
+    email    = "fastly-ruby-test-#{random_string}[e-mail]"
+    user     = @fastly.create_user(:login => email, :name => 'New User')
     customer.owner_id = user.id
 
     tmp = @fastly.update_customer(customer)
     assert tmp
     assert_equal customer.id, tmp.id
     assert_equal customer.owner.id, tmp.owner.id
   end
 
   def test_creating_and_updating_customer_with_owner
     return unless @fastly.current_user.can_do?(:admin)
-    email    = "fastly-ruby-test-#{get_rand}[e-mail]"
-    customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{get_rand}", :owner => { :login => email, :name => "Test NewOwner" })
+    email    = "fastly-ruby-test-#{random_string}[e-mail]"
+    customer = @fastly.create_customer(:name => "fastly-ruby-test-customer-#{random_string}", :owner => { :login => email, :name => 'Test NewOwner' })
     assert customer
     assert_equal customer.owner.login, email
   end
-
 end