diff --git a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php index 32013fc..2658b1a 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php @@ -36,7 +36,7 @@ function testRoleAdministration() { // Test presence of tab. $this->drupalGet('admin/people/permissions'); $tabs = $this->xpath('//ul[@class=:classes and //a[contains(., :text)]]', array( - ':classes' => 'tabs secondary', + ':classes' => 'tabs primary', ':text' => t('Roles'), )); $this->assertEqual(count($tabs), 1, 'Found roles tab'); diff --git a/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php b/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php index 6b25c43..ac624fc 100644 --- a/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php +++ b/core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php @@ -44,9 +44,9 @@ public function testUserAdminLocalTasks($route, $expected) { */ public function getUserAdminRoutes() { return array( - array('user.admin_account', array(array('user.admin_account', 'user.admin_permissions'))), - array('user.admin_permissions', array(array('user.admin_account', 'user.admin_permissions'), array('user.admin_permissions_sub', 'user.role_list'))), - array('user.role_list', array(array('user.admin_account', 'user.admin_permissions'), array('user.admin_permissions_sub', 'user.role_list'))), + array('user.admin_account', array(array('user.admin_account', 'user.admin_permissions', 'user.role_list'))), + array('user.admin_permissions', array(array('user.admin_account', 'user.admin_permissions', 'user.role_list'))), + array('user.role_list', array(array('user.admin_account', 'user.admin_permissions', 'user.role_list'))), array('user.account_settings', array(array('user.account_settings_tab'))), ); } diff --git a/core/modules/user/user.local_tasks.yml b/core/modules/user/user.local_tasks.yml index 09699b9..a9cff5b 100644 --- a/core/modules/user/user.local_tasks.yml +++ b/core/modules/user/user.local_tasks.yml @@ -48,15 +48,8 @@ user.admin_permissions: route_name: user.admin_permissions tab_root_id: user.admin_account -user.admin_permissions_sub: - title: Permissions - route_name: user.admin_permissions - tab_root_id: user.admin_account - tab_parent_id: user.admin_permissions - user.role_list: title: 'Roles' route_name: user.role_list tab_root_id: user.admin_account - tab_parent_id: user.admin_permissions weight: 10