diff --git a/modules/authcache_enum/lib/Drupal/authcache_enum/Tests/AuthcacheEnumKeysTestCase.php b/modules/authcache_enum/lib/Drupal/authcache_enum/Tests/AuthcacheEnumKeysTestCase.php index 94036f9..5186518 100644 --- a/modules/authcache_enum/lib/Drupal/authcache_enum/Tests/AuthcacheEnumKeysTestCase.php +++ b/modules/authcache_enum/lib/Drupal/authcache_enum/Tests/AuthcacheEnumKeysTestCase.php @@ -159,8 +159,8 @@ class AuthcacheEnumKeysTestCase extends \DrupalWebTestCase { ); // Data for hook_authcache_enum_key_property_info_alter(). - // Remove roles and customize choices on base_root property. - $base_roots = array( + // Remove roles and customize choices on base_key property. + $base_keys = array( 'http://www.' . $this->randomName(6) . '.com', 'http://www.' . $this->randomName(7) . '.com', ); @@ -169,28 +169,28 @@ class AuthcacheEnumKeysTestCase extends \DrupalWebTestCase { 'roles' => TRUE, ), 'insert' => array( - 'base_root' => array( - 'name' => t('The root URL of the host, excluding the path'), - 'choices' => $base_roots, + 'base_key' => array( + 'name' => 'The key for anonymous users. By default the root URL of the host, excluding the path', + 'choices' => $base_keys, ), ), ); $expect_properties = array( array( - 'base_root' => $base_roots[0], + 'base_key' => $base_keys[0], 'js' => FALSE, ), array( - 'base_root' => $base_roots[0], + 'base_key' => $base_keys[0], 'js' => TRUE, ), array( - 'base_root' => $base_roots[1], + 'base_key' => $base_keys[1], 'js' => FALSE, ), array( - 'base_root' => $base_roots[1], + 'base_key' => $base_keys[1], 'js' => TRUE, ), ); @@ -200,7 +200,7 @@ class AuthcacheEnumKeysTestCase extends \DrupalWebTestCase { ksort($expect_alter); $expect_keys = $user_keys; - $expect_keys[] = $base_root; + $expect_keys[] = $base_key; $infostub = $this->stubmod->hook('authcache_enum_key_property_info', $custom_property_info); $infoalterstub = $this->stubmod->hook('authcache_enum_key_property_info_alter', $property_info_alter); @@ -236,7 +236,7 @@ class AuthcacheEnumKeysTestCase extends \DrupalWebTestCase { * Test deprecated authenticated key customization. */ public function testDeprecatedCustomAuthenticatedKeys() { - global $base_root; + $base_key = authcache_backend_anonymous_key(); $rid1 = (int) $this->drupalCreateRole(array()); $rid2 = (int) $this->drupalCreateRole(array());