From 4f3e5cd94085d9a83aa9e52c95bf0fd7aedfb753 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 11 Sep 2009 06:20:49 +0000 Subject: - Patch #574002 by sun: remove argument from user_access(). --- modules/user/user.test | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'modules/user/user.test') diff --git a/modules/user/user.test b/modules/user/user.test index 259f58053..fff085b63 100644 --- a/modules/user/user.test +++ b/modules/user/user.test @@ -889,20 +889,24 @@ class UserPermissionsTestCase extends DrupalWebTestCase { $account = $this->admin_user; // Add a permission. - $this->assertFalse(user_access('administer nodes', $account, TRUE), t('User does not have "administer nodes" permission.')); + $this->assertFalse(user_access('administer nodes', $account), t('User does not have "administer nodes" permission.')); $edit = array(); $edit[$rid . '[administer nodes]'] = TRUE; $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions')); $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.')); - $this->assertTrue(user_access('administer nodes', $account, TRUE), t('User now has "administer nodes" permission.')); + drupal_static_reset('user_access'); + drupal_static_reset('user_role_permissions'); + $this->assertTrue(user_access('administer nodes', $account), t('User now has "administer nodes" permission.')); // Remove a permission. - $this->assertTrue(user_access('access user profiles', $account, TRUE), t('User has "access user profiles" permission.')); + $this->assertTrue(user_access('access user profiles', $account), t('User has "access user profiles" permission.')); $edit = array(); $edit[$rid . '[access user profiles]'] = FALSE; $this->drupalPost('admin/config/people/permissions', $edit, t('Save permissions')); $this->assertText(t('The changes have been saved.'), t('Successful save message displayed.')); - $this->assertFalse(user_access('access user profiles', $account, TRUE), t('User no longer has "access user profiles" permission.')); + drupal_static_reset('user_access'); + drupal_static_reset('user_role_permissions'); + $this->assertFalse(user_access('access user profiles', $account), t('User no longer has "access user profiles" permission.')); } /** @@ -922,8 +926,7 @@ class UserPermissionsTestCase extends DrupalWebTestCase { $edit = array(); $edit['modules[Core][aggregator][enable]'] = TRUE; $this->drupalPost('admin/config/modules', $edit, t('Save configuration')); - - $this->assertTrue(user_access('administer news feeds', $this->admin_user, TRUE), t('The permission was automatically assigned to the administrator role')); + $this->assertTrue(user_access('administer news feeds', $this->admin_user), t('The permission was automatically assigned to the administrator role')); } } -- cgit v1.2.3