diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php index 6e24922..234391d 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTest.php @@ -59,7 +59,7 @@ function testUserAdmin() { // Filter the users by role. Grab the system-generated role name for User C. $roles = $user_c->roles; unset($roles[array_search(DRUPAL_AUTHENTICATED_RID, $roles)]); - $this->drupalGet('admin/people', array('query' => array('role' => key($roles)))); + $this->drupalGet('admin/people', array('query' => array('role' => reset($roles)))); // Check if the correct users show up when filtered by role. $this->assertNoText($user_a->name, 'User A not on filtered by role on admin users page'); @@ -70,7 +70,7 @@ function testUserAdmin() { $account = user_load($user_c->uid); $this->assertEqual($account->status, 1, 'User C not blocked'); $edit = array(); - $edit['operation'] = 'user_block_user_action'; + $edit['action'] = 'user_block_user_action'; $edit['user_bulk_form[1]'] = TRUE; $this->drupalPost('admin/people', $edit, t('Apply')); $account = user_load($user_c->uid, TRUE); @@ -78,7 +78,7 @@ function testUserAdmin() { // Test unblocking of a user from /admin/people page and sending of activation mail $editunblock = array(); - $editunblock['operation'] = 'user_unblock_user_action'; + $editunblock['action'] = 'user_unblock_user_action'; $editunblock['user_bulk_form[1]'] = TRUE; $this->drupalPost('admin/people', $editunblock, t('Apply')); $account = user_load($user_c->uid, TRUE); diff --git a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php index 06ba2ee..15e9912 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserCancelTest.php @@ -89,7 +89,7 @@ function testUserCancelUid1() { $this->admin_user = $this->drupalCreateUser(array('administer users')); $this->drupalLogin($this->admin_user); $edit = array( - 'operation' => 'user_cancel_user_action', + 'action' => 'user_cancel_user_action', 'user_bulk_form[0]' => TRUE, ); $this->drupalPost('admin/people', $edit, t('Apply')); @@ -410,10 +410,9 @@ function testMassUserCancelByAdmin() { // Cancel user accounts, including own one. $edit = array(); - $edit['operation'] = 'user_cancel_user_action'; + $edit['action'] = 'user_cancel_user_action'; for ($i = 0; $i <= 4; $i++) { $edit['user_bulk_form[' . $i . ']'] = TRUE; - $edit['accounts[' . $uid . ']'] = TRUE; } $this->drupalPost('admin/people', $edit, t('Apply')); $this->assertText(t('Are you sure you want to cancel these user accounts?'), 'Confirmation form to cancel accounts displayed.');