diff --git a/core/modules/user/config/tour.tour.people.yml b/core/modules/user/config/tour.tour.people.yml index 8f6b752..71b0dab 100644 --- a/core/modules/user/config/tour.tour.people.yml +++ b/core/modules/user/config/tour.tour.people.yml @@ -2,21 +2,22 @@ id: people module: user label: 'People' langcode: en -paths: - - 'admin/people' +status: 1 +routes: + - route_name: user.admin_account tips: people-main: id: people-main plugin: text label: 'Managing users' body: 'This page shows you a list of all of the registered users of your site.' - weight: '1' + weight: 1 people-add: id: people-add plugin: text label: 'Add a user' body: 'Users can register on your site or you can add them manually here.' - weight: '2' + weight: 2 attributes: data-class: 'action-links' people-filter: @@ -24,7 +25,6 @@ tips: plugin: text label: 'Search or filter users' body: 'Use this to hide users from the list or search for a specific user.' - weight: '3' + weight: 3 attributes: data-id: 'views-exposed-form-user-admin-people-page-1' -status: '1' diff --git a/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php b/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php index f286a52..a499f14 100644 --- a/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php +++ b/core/modules/user/lib/Drupal/user/Tests/UserAdminTourTest.php @@ -7,33 +7,36 @@ namespace Drupal\user\Tests; -use Drupal\tour\Tests\TourTestBase; +use Drupal\tour\Tests\TourTestBasic; /** * Tests tour functionality. */ -class UserAdminTourTest extends TourTestBase { +class UserAdminTourTest extends TourTestBasic { /** - * An admin user with administrative permissions for menu. + * Modules to enable. * - * @var \Drupal\user\UserInterface + * @var array */ - protected $adminUser; + public static $modules = array('user', 'tour', 'views'); /** - * Modules to enable. + * The pages we want to test for tour tip coverage. * * @var array + * A list of pages to test. */ - public static $modules = array('user', 'tour', 'views'); + protected $tips = array( + 'admin/people' => array(), + ); -/** - * The permissions required for a logged in user to test tour tips. - * - * @var array - * A list of permissions. - */ + /** + * The permissions required for a logged in user to test tour tips. + * + * @var array + * A list of permissions. + */ protected $permissions = array('access tour', 'administer users'); @@ -45,21 +48,4 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - $this->adminUser = $this->drupalCreateUser(array('access tour', 'administer users')); - $this->drupalLogin($this->adminUser); - } - - /** - * Tests menu tour tip availability. - */ - public function testMenuTourTips() { - // Visit user page. - $this->drupalGet('admin/people'); - $tips = array(); - $tips[] = array('data-id' => 'views-exposed-form-user-admin-people-page-1'); - $this->assertTourTips($tips); - } - }