test/test_credentials.rb in adwords4r-15.1.0 vs test/test_credentials.rb in adwords4r-16.0.0

@@ -47,13 +47,13 @@
         "'useragent' not present in credentials")
     assert(!(credentials.credentials['token'].nil? and
         credentials.credentials['developerToken'].nil?),
         "Neither 'token' nor 'developerToken' present in credentials")
 
-    # Look for alternateUrl, should be defined for the tests anyway
-    assert_not_nil(credentials.alternateUrl,
-        "'alternateUrl' not present in credentials")
+    # Look for environment, should be defined for the tests anyway
+    assert_not_nil(credentials.environment,
+        "'environment' not defined in credentials")
   end
 
   # Test loading credentials from a hash
   def test_credentials_from_hash
     cred_hash = {
@@ -61,21 +61,26 @@
       'useragent' => 'Sample User Agent',
       'password' => 'password',
       'email' => '[e-mail]',
       'clientEmail' => '[e-mail]',
       'applicationToken' => 'IGNORED',
-      'alternateUrl' => 'https://sandbox.google.com/api/adwords/v13/'
+      'environment' => 'SANDBOX'
     }
 
     credentials = AdWords::AdWordsCredentials.new(cred_hash)
 
     cred_hash.each do |key, value|
-      # Is alternateUrl present and correct?
-      if key == 'alternateUrl'
-        assert_not_nil(credentials.alternateUrl,
-            "'#{key}' not present in credentials")
-        assert_equal(value, credentials.alternateUrl,
+      # Is environment present and correct?
+      if key == 'environment'
+        assert_not_nil(credentials.environment,
+            "'#{key}' not defined in credentials")
+        assert_equal(value, credentials.environment,
             "'#{key}' has different value in credentials")
+      # The useragent is prepended with 'adwords4r: ' so it won't be an
+      # exact match.
+      elsif key == 'useragent'
+        assert_match(/#{cred_hash[key]}$/, credentials.credentials[key],
+                     "useragent is not properly populated in credentials.")
       # Is every other key present and correct?
       else
         assert_not_nil(credentials.credentials[key],
             "'#{key}' not present in credentials")
         assert_equal(value, credentials.credentials[key],