From 58b15e1960a5762b86bb61c403c661e3a61bfaef Mon Sep 17 00:00:00 2001 From: Lauri Eskola Date: Mon, 4 Apr 2022 17:11:43 +0300 Subject: [PATCH] Issue #3268443 by danflanagan8, ravi.shankar, dww, longwave: Configuration Manager (config) tests should not rely on Classy --- .../config_clash_test_theme.info.yml | 2 +- .../install/block.block.config_override_test.yml | 4 ++-- .../config/install/block.block.call_to_action.yml | 4 ++-- ...cheabilityMetadataConfigOverrideIntegrationTest.php | 2 +- .../tests/src/Functional/ConfigEntityListTest.php | 10 +++++----- .../src/Functional/ConfigImportInstallProfileTest.php | 7 +++---- .../config/tests/src/Functional/ConfigImportUITest.php | 2 +- 7 files changed, 15 insertions(+), 16 deletions(-) diff --git a/core/modules/config/tests/config_clash_test_theme/config_clash_test_theme.info.yml b/core/modules/config/tests/config_clash_test_theme/config_clash_test_theme.info.yml index 27542f084a24..6f0573f9680a 100644 --- a/core/modules/config/tests/config_clash_test_theme/config_clash_test_theme.info.yml +++ b/core/modules/config/tests/config_clash_test_theme/config_clash_test_theme.info.yml @@ -2,7 +2,7 @@ name: 'Test theme for configuration clash detection' type: theme description: 'Test theme for configuration clash detection' version: VERSION -base theme: classy +base theme: stark regions: content: Content left: Left diff --git a/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml index 6ff267a4cf83..3fdeeb977aab 100644 --- a/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml +++ b/core/modules/config/tests/config_override_integration_test/config/install/block.block.config_override_test.yml @@ -4,9 +4,9 @@ dependencies: module: - block_test theme: - - classy + - stark id: config_override_test -theme: classy +theme: stark region: content weight: 0 plugin: test_cache diff --git a/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml index 4e3f8742399e..73270c8e0c50 100644 --- a/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml +++ b/core/modules/config/tests/config_override_test/config/install/block.block.call_to_action.yml @@ -4,9 +4,9 @@ dependencies: module: - block_content theme: - - classy + - stark id: call_to_action -theme: classy +theme: stark region: content weight: null provider: null diff --git a/core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php b/core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php index 81a70d1b2d41..b2420f1e3836 100644 --- a/core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php +++ b/core/modules/config/tests/src/Functional/CacheabilityMetadataConfigOverrideIntegrationTest.php @@ -25,7 +25,7 @@ class CacheabilityMetadataConfigOverrideIntegrationTest extends BrowserTestBase /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} diff --git a/core/modules/config/tests/src/Functional/ConfigEntityListTest.php b/core/modules/config/tests/src/Functional/ConfigEntityListTest.php index e80cf5b4df31..ff12dab1f004 100644 --- a/core/modules/config/tests/src/Functional/ConfigEntityListTest.php +++ b/core/modules/config/tests/src/Functional/ConfigEntityListTest.php @@ -26,7 +26,7 @@ class ConfigEntityListTest extends BrowserTestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * {@inheritdoc} @@ -179,14 +179,14 @@ class ConfigEntityListTest extends BrowserTestBase { $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/thead/tr/th[3]', 'Operations'); // Check the number of table row cells. - $this->assertSession()->elementsCount('xpath', '//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td', 3); + $this->assertSession()->elementsCount('xpath', '//div[@class="layout-content"]//table/tbody/tr[1]/td', 3); // Check the contents of each row cell. The first cell contains the label, // the second contains the machine name, and the third contains the // operations list. - $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td[1]', 'Default'); - $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td[2]', 'dotted.default'); - $this->assertSession()->elementExists('xpath', '//div[@class="layout-content"]//table/tbody/tr[@class="odd"]/td[3]//ul'); + $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/tbody/tr[1]/td[1]', 'Default'); + $this->assertSession()->elementTextEquals('xpath', '//div[@class="layout-content"]//table/tbody/tr[1]/td[2]', 'dotted.default'); + $this->assertSession()->elementExists('xpath', '//div[@class="layout-content"]//table/tbody/tr[1]/td[3]//ul'); // Add a new entity using the operations link. $this->assertSession()->linkExists('Add test configuration'); diff --git a/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php b/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php index 9766979d4eac..cadd96ad32f1 100644 --- a/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php +++ b/core/modules/config/tests/src/Functional/ConfigImportInstallProfileTest.php @@ -68,12 +68,11 @@ class ConfigImportInstallProfileTest extends BrowserTestBase { $core['module']['testing_config_import'] = 0; unset($core['module']['syslog']); unset($core['theme']['stark']); - $core['theme']['stable'] = 0; - $core['theme']['classy'] = 0; + $core['theme']['test_theme_theme'] = 0; $sync->write('core.extension', $core); $sync->deleteAll('syslog.'); $theme = $sync->read('system.theme'); - $theme['default'] = 'classy'; + $theme['default'] = 'test_theme_theme'; $sync->write('system.theme', $theme); $this->drupalGet('admin/config/development/configuration'); $this->submitForm([], 'Import all'); @@ -81,7 +80,7 @@ class ConfigImportInstallProfileTest extends BrowserTestBase { $this->rebuildContainer(); $this->assertFalse(\Drupal::moduleHandler()->moduleExists('syslog'), 'The syslog module has been uninstalled.'); $this->assertFalse(\Drupal::service('theme_handler')->themeExists('stark'), 'The stark theme has been uninstalled.'); - $this->assertTrue(\Drupal::service('theme_handler')->themeExists('classy'), 'The classy theme has been installed.'); + $this->assertTrue(\Drupal::service('theme_handler')->themeExists('test_theme_theme'), 'The test_theme_theme theme has been installed.'); } } diff --git a/core/modules/config/tests/src/Functional/ConfigImportUITest.php b/core/modules/config/tests/src/Functional/ConfigImportUITest.php index 4791f5fc99b1..f91aba49b908 100644 --- a/core/modules/config/tests/src/Functional/ConfigImportUITest.php +++ b/core/modules/config/tests/src/Functional/ConfigImportUITest.php @@ -28,7 +28,7 @@ class ConfigImportUITest extends BrowserTestBase { /** * {@inheritdoc} */ - protected $defaultTheme = 'classy'; + protected $defaultTheme = 'stark'; /** * A user with the 'synchronize configuration' permission.