Commit d074962a authored by David Suissa's avatar David Suissa
Browse files

Issue #3559521 by dydave: Automated tests: Fixed support for Drupal 9 (deprecated major).

parent a5f07bb1

admin_toolbar_search/tests/src/Functional/AdminToolbarSearchSettingsFormTest.php

+2 −1
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ class AdminToolbarSearchSettingsFormTest extends BrowserTestBase { 
    /* Test module's primary local tasks (tabs). */



    // Check the three modules local tasks (tabs) are displayed as expected.

    $local_tasks_regex = '/<div.*-primary-local-tasks.*>([\r\n].*)+<a.*>Toolbar settings<\/a>.*[\r\n].*<a.*>Search settings<\/a>.*[\r\n].*<a.*>Tools settings<\/a>.*[\r\n].*([\r\n].*)+<\/div>/';

    // @todo Revert the changes from DO-3559521 when support from D9 is dropped.

    $local_tasks_regex = '/<div.*-primary-local-tasks.*>([\r\n].*)+<a.*>Toolbar settings<\/a>.*[\r\n].*<a.*>Search settings(.*active tab.*)?<\/a>.*[\r\n].*<a.*>Tools settings<\/a>.*[\r\n].*([\r\n].*)+<\/div>/';

    $assert->responseMatches($local_tasks_regex);



    /* Test the permission: 'use admin toolbar search'. */

admin_toolbar_tools/tests/src/Functional/AdminToolbarToolsTest.php

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ class AdminToolbarToolsTest extends BrowserTestBase { 
    // Use a regex to check in the response HTML code that the extra links for

    // menus are displayed with the expected tags, IDs and CSS classes. This

    // also ensures the links have the expected order.

    $assert->responseMatches('/<div class="panel">[\r\n ]*<h3 class="panel__title">Admin Toolbar Extra Tools<\/h3>[\r\n ]*<div class="panel__content">[\r\n ]*<dl class="list-group">[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/admin\/add">Add link<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/footer\/add">Add link<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/add">Add menu<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/admin" title="Administrative task links">Administration<\/a><\/dt>[\r\n ]*<dd class="list-group__description">Administrative task links<\/dd>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/config\/user-interface\/admin-toolbar-tools" title="Configure the Admin Toolbar Tools module.">Admin Toolbar Tools<\/a><\/dt>[\r\n ]*<dd class="list-group__description">Configure the Admin Toolbar Tools module.<\/dd>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu">All menus<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\?token=.*">Flush all caches<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/cssjs\?token=.*">Flush CSS and JavaScript<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/plugin\?token=.*">Flush plugins cache<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/rendercache\?token=.*">Flush render cache<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/menu\?token=.*">Flush routing and links cache<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/static-caches\?token=.*">Flush static cache<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/twig\?token=.*">Flush twig cache<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/footer" title="Site information links">Footer<\/a><\/dt>[\r\n ]*<dd class="list-group__description">Site information links<\/dd>[\r\n ]*<dt class="list-group__link"><a href=".*\/">Front page<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/index">Index<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/user\/logout\?token=.*">Logout<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/flush\/theme_rebuild\?token=.*">Rebuild theme registry<\/a><\/dt>[\r\n ]*<dt class="list-group__link"><a href=".*\/run-cron\?token=.*">Run cron<\/a><\/dt>[\r\n ]*<\/dl>[\r\n ]*<\/div>[\r\n ]*<\/div>/');

    $assert->responseMatches('/<div class="panel">[\r\n ]*<h3 class="panel__title">Admin Toolbar Extra Tools<\/h3>[\r\n ]*<div class="panel__content">[\r\n ]*<dl class="list-group">[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/admin\/add">Add link<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/footer\/add">Add link<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/add">Add menu<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/admin" title="Administrative task links">Administration<\/a><\/dt>[\r\n ]*<dd class="list-group__description">Administrative task links<\/dd>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/config\/user-interface\/admin-toolbar-tools" title="Configure the Admin Toolbar Tools module.">Admin Toolbar Tools<\/a><\/dt>[\r\n ]*<dd class="list-group__description">Configure the Admin Toolbar Tools module.<\/dd>[\r\n ]*<dt class="list-group__link"><a href=".*\/admin\/structure\/menu">All menus<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\?token=.*">Flush all caches<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/cssjs\?token=.*">Flush CSS and JavaScript<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/plugin\?token=.*">Flush plugins cache<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/rendercache\?token=.*">Flush render cache<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/menu\?token=.*">Flush routing and links cache<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/static-caches\?token=.*">Flush static cache<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/twig\?token=.*">Flush twig cache<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/structure\/menu\/manage\/footer" title="Site information links">Footer<\/a><\/dt>[\r\n ]*<dd class="list-group__description">Site information links<\/dd>[\r\n ]*<dt class="list-group__link"><a href=".*\/">Front page<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/index">Index<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/user\/logout(\?token=.*)?">Logout<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/admin\/flush\/theme_rebuild\?token=.*">Rebuild theme registry<\/a><\/dt>([\r\n].*)+<dt class="list-group__link"><a href=".*\/run-cron\?token=.*">Run cron<\/a><\/dt>([\r\n].*)+<\/dl>[\r\n ]*<\/div>[\r\n ]*<\/div>/');



  }