diff --git a/core/modules/menu/config/tour.tour.menu.yml b/core/modules/menu/config/tour.tour.menu.yml index 01d3335..4c7de36 100644 --- a/core/modules/menu/config/tour.tour.menu.yml +++ b/core/modules/menu/config/tour.tour.menu.yml @@ -2,8 +2,8 @@ id: menu module: menu label: 'Menu Listing Page' langcode: en -paths: - - admin/structure/menu +routes: + - route_name: menu.overview_page tips: menu-listing: id: menu-listing diff --git a/core/modules/menu/lib/Drupal/menu/Tests/MenuTourTest.php b/core/modules/menu/lib/Drupal/menu/Tests/MenuTourTest.php index a4fb508..3b30671 100644 --- a/core/modules/menu/lib/Drupal/menu/Tests/MenuTourTest.php +++ b/core/modules/menu/lib/Drupal/menu/Tests/MenuTourTest.php @@ -7,27 +7,45 @@ namespace Drupal\menu\Tests; -use Drupal\tour\Tests\TourTestBase; +use Drupal\tour\Tests\TourTestBasic; /** * Tests tour functionality. */ -class MenuTourTest extends TourTestBase { +class MenuTourTest extends TourTestBasic { /** - * An admin user with administrative permissions for menu. + * An admin user with administrative permissions. * * @var \Drupal\user\UserInterface */ protected $adminUser; /** + * The permissions required for a logged in user to test tour tips. + * + * @var array + * A list of permissions. + */ + protected $permissions = array('administer menu', 'access tour'); + + /** * Modules to enable. * * @var array */ public static $modules = array('menu', 'tour'); + /** + * The pages we want to test for tour tip coverage. + * + * @var array + * A list of pages to test. + */ + protected $tips = array( + 'admin/structure/menu' => array(), + ); + public static function getInfo() { return array( 'name' => 'Menu tour tests', @@ -36,19 +54,4 @@ public static function getInfo() { ); } - protected function setUp() { - parent::setUp(); - $this->adminUser = $this->drupalCreateUser(array('administer menu', 'access tour')); - $this->drupalLogin($this->adminUser); - } - - /** - * Tests menu tour tip availability. - */ - public function testMenuTourTips() { - // Visit menu page. - $this->drupalGet('admin/structure/menu'); - $this->assertTourTips(); - } - }