From c0dca8d0302420f489d221b76beb2715796d790c Mon Sep 17 00:00:00 2001 From: catch Date: Mon, 8 Nov 2021 14:36:24 +0000 Subject: [PATCH] Issue #3247901 by danflanagan8, longwave: ContentTranslationUITestBase should not rely on Classy (cherry picked from commit 84ef68cf9954147789e61d1622a1609b19c27628) --- .../tests/src/Functional/BlockContentTranslationUITest.php | 2 +- .../tests/src/Functional/ContentTestTranslationUITest.php | 2 +- .../tests/src/Functional/ContentTranslationUITestBase.php | 2 +- .../media/tests/src/Functional/MediaTranslationUITest.php | 2 +- .../tests/src/Functional/MenuLinkContentTranslationUITest.php | 2 +- .../shortcut/tests/src/Functional/ShortcutTranslationUITest.php | 2 +- .../taxonomy/tests/src/Functional/TermTranslationUITest.php | 2 +- .../modules/user/tests/src/Functional/UserTranslationUITest.php | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php b/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php index 3d93ed33e85..3f3fea1c268 100644 --- a/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php @@ -28,7 +28,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} diff --git a/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php index 3f644b9a8e5..ba0cbf67071 100644 --- a/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php +++ b/core/modules/content_translation/tests/src/Functional/ContentTestTranslationUITest.php @@ -39,7 +39,7 @@ class ContentTestTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} diff --git a/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php index 776bd654ccd..e853e595df9 100644 --- a/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php +++ b/core/modules/content_translation/tests/src/Functional/ContentTranslationUITestBase.php @@ -359,7 +359,7 @@ abstract class ContentTranslationUITestBase extends ContentTranslationTestBase { ]; $this->drupalGet($entity->toUrl('edit-form')); $this->submitForm($edit, $this->getFormSubmitAction($entity, $langcode)); - $this->assertSession()->elementExists('xpath', '//div[contains(@class, "error")]//ul'); + $this->assertSession()->elementExists('xpath', '//div[@aria-label="Error message"]//ul'); $metadata = $this->manager->getTranslationMetadata($entity->getTranslation($langcode)); $this->assertEquals($values[$langcode]['uid'], $metadata->getAuthor()->id(), 'Translation author correctly kept.'); $this->assertEquals($values[$langcode]['created'], $metadata->getCreatedTime(), 'Translation date correctly kept.'); diff --git a/core/modules/media/tests/src/Functional/MediaTranslationUITest.php b/core/modules/media/tests/src/Functional/MediaTranslationUITest.php index 6b1d6442db0..20d3cd8c6e2 100644 --- a/core/modules/media/tests/src/Functional/MediaTranslationUITest.php +++ b/core/modules/media/tests/src/Functional/MediaTranslationUITest.php @@ -17,7 +17,7 @@ class MediaTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php index a7ddeed92dd..8dc2b7865ed 100644 --- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php +++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php @@ -32,7 +32,7 @@ class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} diff --git a/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php index 0d0a80d6a53..4b059fd0dbd 100644 --- a/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php +++ b/core/modules/shortcut/tests/src/Functional/ShortcutTranslationUITest.php @@ -35,7 +35,7 @@ class ShortcutTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} diff --git a/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php b/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php index 049da47d148..179b4adea87 100644 --- a/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php +++ b/core/modules/taxonomy/tests/src/Functional/TermTranslationUITest.php @@ -41,7 +41,7 @@ class TermTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; protected function setUp(): void { $this->entityTypeId = 'taxonomy_term'; diff --git a/core/modules/user/tests/src/Functional/UserTranslationUITest.php b/core/modules/user/tests/src/Functional/UserTranslationUITest.php index 7ba1a2b9ec0..9e7b2ea2489 100644 --- a/core/modules/user/tests/src/Functional/UserTranslationUITest.php +++ b/core/modules/user/tests/src/Functional/UserTranslationUITest.php @@ -44,7 +44,7 @@ class UserTranslationUITest extends ContentTranslationUITestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; protected function setUp(): void { $this->entityTypeId = 'user';