Skip to content
Snippets Groups Projects
Commit b039939b authored by catch's avatar catch
Browse files

Issue #3281439 by nod_, Spokje, deviantintegral, _shY, andregp, lauriii:...

Issue #3281439 by nod_, Spokje, deviantintegral, _shY, andregp, lauriii: Update Help Topics tests to not use Bartik and Seven

(cherry picked from commit 0ec67661)
parent 4c29de46
No related branches found
No related tags found
24 merge requests!8506Draft: Issue #3456536 by ibrahim tameme,!5646Issue #3350972 by nod_: [random test failure]...,!5600Issue #3350972 by nod_: [random test failure]...,!5343Issue #3305066 by quietone, Rename RedirectLeadingSlashesSubscriber,!4350Issue #3307718: Implement xxHash for non-cryptographic use-cases,!3603#ISSUE 3346218 Add a different message on edit comment,!3555Issue #2473873: Views entity operations lack cacheability support, resulting in incorrect dropbuttons,!3494Issue #3327018 by Spokje, longwave, xjm, mondrake: Update PHPStan to 1.9.3 and...,!3410Issue #3340128: UserLoginForm::submitForm has some dead code,!3389Issue #3325184 by Spokje, andypost, xjm, smustgrave: $this->configFactory is...,!3381Issue #3332363: Refactor Claro's menus-and-lists stylesheet,!3307Issue #3326193: CKEditor 5 can grow past the viewport when there is a lot of content,!3236Issue #3332419: Refactor Claro's messages stylesheet,!3231Draft: Issue #3049525 by longwave, fougere, larowlan, kim.pepper, AaronBauman, Wim...,!3212Issue #3294003: Refactor Claro's entity-meta stylesheet,!3194Issue #3330981: Fix PHPStan L1 error "Relying on entity queries to check access by default is deprecated...",!3143Issue #3313342: [PHP 8.1] Deprecated function: strpos(): Passing null to parameter #1 LayoutBuilderUiCacheContext.php on line 28,!3024Issue #3307509: Empty option for views bulk form,!2972Issue #1845004: Replace custom password hashing library with PHP 5.5 password_hash(),!2719Issue #3110137: Remove Classy from core.,!2688Issue #3261452: [PP-1] Remove tracker module from core,!2437Issue #3238257 by hooroomoo, Wim Leers: Fragment link pointing to <textarea>...,!2296Issue #3100732: Allow specifying `meta` data on JSON:API objects,!1626Issue #3256642: Make life better for database drivers that extend another database driver
langcode: en
status: true
dependencies:
module:
- search
- system
theme:
- claro
enforced:
config:
- search.page.help_search
id: claro_help_search
theme: claro
region: help
weight: -4
provider: null
plugin: search_form_block
settings:
id: search_form_block
label: 'Search help'
label_display: visible
provider: search
page_id: help_search
visibility:
request_path:
id: request_path
negate: false
context_mapping: { }
pages: /admin/help
......@@ -57,14 +57,13 @@ class HelpTopicTest extends BrowserTestBase {
protected function setUp(): void {
parent::setUp();
// These tests rely on some markup from the 'Seven' theme and we test theme
// These tests rely on some markup from the 'stark' theme and we test theme
// provided help topics.
\Drupal::service('theme_installer')->install(['seven', 'help_topics_test_theme']);
\Drupal::service('config.factory')->getEditable('system.theme')->set('admin', 'seven')->save();
\Drupal::service('theme_installer')->install(['help_topics_test_theme']);
// Place various blocks.
$settings = [
'theme' => 'seven',
'theme' => 'stark',
'region' => 'help',
];
$this->placeBlock('help_block', $settings);
......@@ -173,7 +172,7 @@ protected function verifyHelp($response = 200) {
// Verify page information.
$name = $info['name'];
$session->titleEquals($name . ' | Drupal');
$session->responseContains('<h1 class="page-title">' . $name . '</h1>');
$session->responseContains('<h1>' . $name . '</h1>');
foreach ($info['tags'] as $tag) {
$session->responseHeaderContains('X-Drupal-Cache-Tags', $tag);
}
......
......@@ -30,15 +30,16 @@ abstract class HelpTopicTranslatedTestBase extends BrowserTestBase {
protected function setUp(): void {
parent::setUp();
// These tests rely on some markup from the 'Seven' theme.
\Drupal::service('theme_installer')->install(['seven']);
// These tests rely on some markup from the 'Claro' theme, as well as an
// optional block added when Claro is enabled.
\Drupal::service('theme_installer')->install(['claro']);
\Drupal::configFactory()->getEditable('system.theme')
->set('admin', 'seven')
->set('admin', 'claro')
->save(TRUE);
// Place various blocks.
$settings = [
'theme' => 'seven',
'theme' => 'claro',
'region' => 'help',
];
$this->placeBlock('help_block', $settings);
......
......@@ -71,7 +71,7 @@ public function testHelpTopics() {
// test can continue.
$this->assertArrayHasKey('system', $directories, 'System module is being scanned');
$this->assertArrayHasKey('help', $directories, 'Help module is being scanned');
$this->assertArrayHasKey('seven', $directories, 'Seven theme is being scanned');
$this->assertArrayHasKey('claro', $directories, 'Claro theme is being scanned');
$this->assertArrayHasKey('standard', $directories, 'Standard profile is being scanned');
$definitions = (new HelpTopicDiscovery($directories))->getDefinitions();
......
......@@ -1133,9 +1133,12 @@ protected function buildStatusMessageSelector(string $message = NULL, string $ty
$aria_label = 'Warning message';
}
if ($message && $aria_label) {
$selector = $this->buildXPathQuery($selector . '//div[contains(@aria-label, :aria_label) and contains(., :message)]', [
if ($message && $aria_label && $type) {
$selector = $this->buildXPathQuery($selector . '//div[(contains(@aria-label, :aria_label) or contains(@aria-labelledby, :type)) and contains(., :message)]', [
// Value of the 'aria-label' attribute, used in Seven and Bartik
':aria_label' => $aria_label,
// Value of the 'aria-labelledby' attribute, used in Claro and Olivero.
':type' => $type,
':message' => $message,
]);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment