Issue #2135975 by larowlan, dawehner, a_thakur: Regression: Second level tabs...

Issue #2135975 by larowlan, dawehner, a_thakur: Regression: Second level tabs for Permissions and Roles missing from admin/people/permissions and admin/pages/permissions pages.

core/modules/user/lib/Drupal/user/Tests/UserRoleAdminTest.php

@@ -33,6 +33,13 @@ function setUp() {
   function testRoleAdministration() {
     $this->drupalLogin($this->admin_user);
     $default_langcode = language_default()->id;
+    // Test presence of tab.
+    $this->drupalGet('admin/people/permissions');
+    $tabs = $this->xpath('//ul[@class=:classes and //a[contains(., :text)]]', array(
+      ':classes' => 'tabs primary',
+      ':text' => t('Roles'),
+    ));
+    $this->assertEqual(count($tabs), 1, 'Found roles tab');
 
     // Test adding a role. (In doing so, we use a role name that happens to
     // correspond to an integer, to test that the role administration pages

core/modules/user/tests/Drupal/user/Tests/Menu/UserLocalTasksTest.php

@@ -44,7 +44,9 @@ public function testUserAdminLocalTasks($route, $expected) {
    */
   public function getUserAdminRoutes() {
     return array(
-      array('user.role_list', array(array('user.role_list_tab'))),
+      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'))),
     );
   }

core/modules/user/user.local_tasks.yml

-user.role_list_tab:
-  route_name: user.role_list
-  title: 'Roles'
-  tab_root_id: user.role_list_tab
 
 user.role_edit:
   title: 'Edit'
@@ -51,3 +47,9 @@ user.admin_permissions:
   title: Permissions
   route_name: user.admin_permissions
   tab_root_id: user.admin_account
+
+user.role_list:
+  title: 'Roles'
+  route_name: user.role_list
+  tab_root_id: user.admin_account
+  weight: 10