diff options
30 files changed, 98 insertions, 106 deletions
diff --git a/core/misc/cspell/dictionary.txt b/core/misc/cspell/dictionary.txt index c75d254d962..ce0541289c7 100644 --- a/core/misc/cspell/dictionary.txt +++ b/core/misc/cspell/dictionary.txt @@ -288,7 +288,6 @@ introspectable invalidators invokable isam -isinstallable itok javascripts jessebeach @@ -393,7 +392,6 @@ nomask nonconfigurable noquotes nosniff -notexisting notnull notsimpletest nourriture @@ -425,7 +423,6 @@ pathauto pcre pcss peast -permissionless persistable phpass phpcbf @@ -494,7 +491,6 @@ relname relpersistence renderable renderables -renderered reparenting replyto resave @@ -515,8 +511,6 @@ ribisi rowspans rtsp ruleset -sameline -samename sameorigin samesite savepoints @@ -544,7 +538,6 @@ smalldatetime smtps somecompany sortablejs -specialchars splitbutton splitbuttons squaresmall @@ -689,14 +682,12 @@ uploadprogress upscaling urandom userinfo -userref vampirize versionable versionless vfsstream viewports wcag -webassert webcal webflo webhosting diff --git a/core/misc/cspell/drupal-dictionary.txt b/core/misc/cspell/drupal-dictionary.txt index 0f018530759..1065bb06f3e 100644 --- a/core/misc/cspell/drupal-dictionary.txt +++ b/core/misc/cspell/drupal-dictionary.txt @@ -8,6 +8,7 @@ drupalci druplicon drupalimage drush +jswebassert langcode langcodes lullabot diff --git a/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml b/core/modules/block/tests/modules/block_test/themes/block_test_special_chars_theme/block_test_special_chars_theme.info.yml index 59ed36afe0e..59ed36afe0e 100644 --- a/core/modules/block/tests/modules/block_test/themes/block_test_specialchars_theme/block_test_specialchars_theme.info.yml +++ b/core/modules/block/tests/modules/block_test/themes/block_test_special_chars_theme/block_test_special_chars_theme.info.yml diff --git a/core/modules/block/tests/src/Functional/BlockTest.php b/core/modules/block/tests/src/Functional/BlockTest.php index 4738e97f0a9..6c223f19726 100644 --- a/core/modules/block/tests/src/Functional/BlockTest.php +++ b/core/modules/block/tests/src/Functional/BlockTest.php @@ -331,11 +331,11 @@ class BlockTest extends BlockTestBase { $this->drupalPlaceBlock('help_block', ['region' => 'help']); $this->drupalPlaceBlock('local_tasks_block'); // Explicitly set the default and admin themes. - $theme = 'block_test_specialchars_theme'; + $theme = 'block_test_special_chars_theme'; \Drupal::service('theme_installer')->install([$theme]); $this->drupalGet('admin/structure/block'); $this->assertSession()->assertEscaped('<"Cat" & \'Mouse\'>'); - $this->drupalGet('admin/structure/block/list/block_test_specialchars_theme'); + $this->drupalGet('admin/structure/block/list/block_test_special_chars_theme'); $this->assertSession()->assertEscaped('Demonstrate block regions (<"Cat" & \'Mouse\'>)'); } diff --git a/core/modules/config/tests/config_test/config/install/config_test.dynamic.isinstallable.yml b/core/modules/config/tests/config_test/config/install/config_test.dynamic.is_installable.yml index 36336a558b3..8b896bc4eb9 100644 --- a/core/modules/config/tests/config_test/config/install/config_test.dynamic.isinstallable.yml +++ b/core/modules/config/tests/config_test/config/install/config_test.dynamic.is_installable.yml @@ -1,4 +1,4 @@ -id: isinstallable +id: is_installable label: Default weight: 0 protected_property: Default diff --git a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php index e2597f0277d..0c6bb13ea2c 100644 --- a/core/modules/config/tests/config_test/src/Entity/ConfigTest.php +++ b/core/modules/config/tests/config_test/src/Entity/ConfigTest.php @@ -195,7 +195,7 @@ class ConfigTest extends ConfigEntityBase implements ConfigTestInterface { * {@inheritdoc} */ public function isInstallable() { - return $this->id != 'isinstallable' || \Drupal::state()->get('config_test.isinstallable'); + return $this->id != 'is_installable' || \Drupal::state()->get('config_test.is_installable'); } /** diff --git a/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.routing.yml b/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.routing.yml deleted file mode 100644 index 712c179f541..00000000000 --- a/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.routing.yml +++ /dev/null @@ -1,15 +0,0 @@ -js_webassert_test.js_webassert_test_form: - path: '/js_webassert_test_form' - defaults: - _form: '\Drupal\js_webassert_test\Form\JsWebAssertTestForm' - _title: 'JsWebAssertForm' - requirements: - _access: 'TRUE' - -js_webassert_test.js_webassert_test_page: - path: '/js_webassert_test_page' - defaults: - _controller: '\Drupal\js_webassert_test\Controller\TestController::page' - _title: 'JsWebAssertPage' - requirements: - _access: 'TRUE' diff --git a/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.no_element_after_wait.js b/core/modules/system/tests/modules/jswebassert_test/js/jswebassert_test.no_element_after_wait.js index a22c818079f..24b853c02e5 100644 --- a/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.no_element_after_wait.js +++ b/core/modules/system/tests/modules/jswebassert_test/js/jswebassert_test.no_element_after_wait.js @@ -10,7 +10,7 @@ * @prop {Drupal~behaviorAttach} attach * Makes changes in the DOM to be able to test the completion of AJAX in assertWaitOnAjaxRequest. */ - Drupal.behaviors.js_webassert_test_wait_for_ajax_request = { + Drupal.behaviors.jswebassert_test_wait_for_ajax_request = { attach() { $('#edit-test-assert-no-element-after-wait-pass').on('click', (e) => { e.preventDefault(); diff --git a/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_ajax_request.js b/core/modules/system/tests/modules/jswebassert_test/js/jswebassert_test.wait_for_ajax_request.js index abea6396e25..30742bf8039 100644 --- a/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_ajax_request.js +++ b/core/modules/system/tests/modules/jswebassert_test/js/jswebassert_test.wait_for_ajax_request.js @@ -10,14 +10,14 @@ * @prop {Drupal~behaviorAttach} attach * Makes changes in the DOM to be able to test the completion of AJAX in assertWaitOnAjaxRequest. */ - Drupal.behaviors.js_webassert_test_wait_for_ajax_request = { + Drupal.behaviors.jswebassert_test_wait_for_ajax_request = { attach(context) { const waitAjaxInput = document.querySelector( 'input[name="test_assert_wait_on_ajax_input"]', ); // Confirm the input exists before assigning a value to it. if (waitAjaxInput) { - waitAjaxInput.value = 'js_webassert_test'; + waitAjaxInput.value = 'jswebassert_test'; } }, }; diff --git a/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_element.js b/core/modules/system/tests/modules/jswebassert_test/js/jswebassert_test.wait_for_element.js index 0017d6a913e..d517fbd876c 100644 --- a/core/modules/system/tests/modules/js_webassert_test/js/js_webassert_test.wait_for_element.js +++ b/core/modules/system/tests/modules/jswebassert_test/js/jswebassert_test.wait_for_element.js @@ -10,9 +10,9 @@ * @prop {Drupal~behaviorAttach} attach * Makes changes in the DOM to be able to test the completion of AJAX in assertWaitOnAjaxRequest. */ - Drupal.behaviors.js_webassert_test_wait_for_element = { + Drupal.behaviors.jswebassert_test_wait_for_element = { attach(context) { - $('#js_webassert_test_element_invisible').show(); + $('#jswebassert_test_element_invisible').show(); }, }; })(jQuery, Drupal, drupalSettings); diff --git a/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.info.yml b/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.info.yml index 951b9349fe6..951b9349fe6 100644 --- a/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.info.yml +++ b/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.info.yml diff --git a/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.libraries.yml b/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.libraries.yml index e7ec966a162..272a41843a5 100644 --- a/core/modules/system/tests/modules/js_webassert_test/js_webassert_test.libraries.yml +++ b/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.libraries.yml @@ -1,13 +1,13 @@ wait_for_ajax_request: version: VERSION js: - js/js_webassert_test.wait_for_ajax_request.js: {} + js/jswebassert_test.wait_for_ajax_request.js: {} dependencies: - core/drupal wait_for_element: version: VERSION js: - js/js_webassert_test.wait_for_element.js: {} + js/jswebassert_test.wait_for_element.js: {} dependencies: - core/jquery - core/drupal @@ -15,7 +15,7 @@ wait_for_element: no_element_after_wait: version: VERSION js: - js/js_webassert_test.no_element_after_wait.js: {} + js/jswebassert_test.no_element_after_wait.js: {} dependencies: - core/jquery - core/drupal diff --git a/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.routing.yml b/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.routing.yml new file mode 100644 index 00000000000..eb47d63073e --- /dev/null +++ b/core/modules/system/tests/modules/jswebassert_test/jswebassert_test.routing.yml @@ -0,0 +1,15 @@ +jswebassert_test.jswebassert_test_form: + path: '/jswebassert_test_form' + defaults: + _form: '\Drupal\jswebassert_test\Form\JsWebAssertTestForm' + _title: 'JsWebAssertForm' + requirements: + _access: 'TRUE' + +jswebassert_test.jswebassert_test_page: + path: '/jswebassert_test_page' + defaults: + _controller: '\Drupal\jswebassert_test\Controller\TestController::page' + _title: 'JsWebAssertPage' + requirements: + _access: 'TRUE' diff --git a/core/modules/system/tests/modules/js_webassert_test/src/Controller/TestController.php b/core/modules/system/tests/modules/jswebassert_test/src/Controller/TestController.php index e27977fcc77..0a9be0e880c 100644 --- a/core/modules/system/tests/modules/js_webassert_test/src/Controller/TestController.php +++ b/core/modules/system/tests/modules/jswebassert_test/src/Controller/TestController.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\js_webassert_test\Controller; +namespace Drupal\jswebassert_test\Controller; use Drupal\Core\Render\Markup; diff --git a/core/modules/system/tests/modules/js_webassert_test/src/Form/JsWebAssertTestForm.php b/core/modules/system/tests/modules/jswebassert_test/src/Form/JsWebAssertTestForm.php index 6240ec4e958..02a5b848047 100644 --- a/core/modules/system/tests/modules/js_webassert_test/src/Form/JsWebAssertTestForm.php +++ b/core/modules/system/tests/modules/jswebassert_test/src/Form/JsWebAssertTestForm.php @@ -1,6 +1,6 @@ <?php -namespace Drupal\js_webassert_test\Form; +namespace Drupal\jswebassert_test\Form; use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; @@ -17,14 +17,14 @@ class JsWebAssertTestForm extends FormBase { * {@inheritdoc} */ public function getFormId() { - return 'js_webassert_test_form'; + return 'jswebassert_test_form'; } /** * Form for testing the addition of various types of elements via AJAX. */ public function buildForm(array $form, FormStateInterface $form_state) { - $form['#prefix'] = '<div id="js_webassert_test_form_wrapper">'; + $form['#prefix'] = '<div id="jswebassert_test_form_wrapper">'; $form['#suffix'] = '</div>'; // Button to test for the waitForButton() assertion. @@ -33,12 +33,12 @@ class JsWebAssertTestForm extends FormBase { '#value' => $this->t('Add button'), '#button_type' => 'primary', '#ajax' => [ - 'callback' => 'Drupal\js_webassert_test\Form\JsWebAssertTestForm::addButton', + 'callback' => 'Drupal\jswebassert_test\Form\JsWebAssertTestForm::addButton', 'progress' => [ 'type' => 'throbber', 'message' => NULL, ], - 'wrapper' => 'js_webassert_test_form_wrapper', + 'wrapper' => 'jswebassert_test_form_wrapper', ], ]; // Button to test for the waitForLink() assertion. @@ -47,12 +47,12 @@ class JsWebAssertTestForm extends FormBase { '#value' => $this->t('Add link'), '#button_type' => 'primary', '#ajax' => [ - 'callback' => 'Drupal\js_webassert_test\Form\JsWebAssertTestForm::addLink', + 'callback' => 'Drupal\jswebassert_test\Form\JsWebAssertTestForm::addLink', 'progress' => [ 'type' => 'throbber', 'message' => NULL, ], - 'wrapper' => 'js_webassert_test_form_wrapper', + 'wrapper' => 'jswebassert_test_form_wrapper', ], ]; // Button to test for the waitForField() assertion. @@ -61,12 +61,12 @@ class JsWebAssertTestForm extends FormBase { '#value' => $this->t('Add field'), '#button_type' => 'primary', '#ajax' => [ - 'callback' => 'Drupal\js_webassert_test\Form\JsWebAssertTestForm::addField', + 'callback' => 'Drupal\jswebassert_test\Form\JsWebAssertTestForm::addField', 'progress' => [ 'type' => 'throbber', 'message' => NULL, ], - 'wrapper' => 'js_webassert_test_form_wrapper', + 'wrapper' => 'jswebassert_test_form_wrapper', ], ]; // Button to test for the waitForId() assertion. @@ -75,12 +75,12 @@ class JsWebAssertTestForm extends FormBase { '#value' => $this->t('Add ID'), '#button_type' => 'primary', '#ajax' => [ - 'callback' => 'Drupal\js_webassert_test\Form\JsWebAssertTestForm::addId', + 'callback' => 'Drupal\jswebassert_test\Form\JsWebAssertTestForm::addId', 'progress' => [ 'type' => 'throbber', 'message' => NULL, ], - 'wrapper' => 'js_webassert_test_form_wrapper', + 'wrapper' => 'jswebassert_test_form_wrapper', ], ]; @@ -90,12 +90,12 @@ class JsWebAssertTestForm extends FormBase { '#value' => $this->t('Test waitForElementVisible'), '#button_type' => 'primary', '#ajax' => [ - 'callback' => 'Drupal\js_webassert_test\Form\JsWebAssertTestForm::addWaitForElementVisible', + 'callback' => 'Drupal\jswebassert_test\Form\JsWebAssertTestForm::addWaitForElementVisible', 'progress' => [ 'type' => 'throbber', 'message' => NULL, ], - 'wrapper' => 'js_webassert_test_form_wrapper', + 'wrapper' => 'jswebassert_test_form_wrapper', ], ]; @@ -105,12 +105,12 @@ class JsWebAssertTestForm extends FormBase { '#value' => $this->t('Test assertWaitOnAjaxRequest'), '#button_type' => 'primary', '#ajax' => [ - 'callback' => 'Drupal\js_webassert_test\Form\JsWebAssertTestForm::addAssertWaitOnAjaxRequest', + 'callback' => 'Drupal\jswebassert_test\Form\JsWebAssertTestForm::addAssertWaitOnAjaxRequest', 'progress' => [ 'type' => 'throbber', 'message' => NULL, ], - 'wrapper' => 'js_webassert_test_form_wrapper', + 'wrapper' => 'jswebassert_test_form_wrapper', ], ]; @@ -119,7 +119,7 @@ class JsWebAssertTestForm extends FormBase { '#type' => 'submit', '#value' => $this->t('Test assertNoElementAfterWait: pass'), '#button_type' => 'primary', - '#attached' => ['library' => 'js_webassert_test/no_element_after_wait'], + '#attached' => ['library' => 'jswebassert_test/no_element_after_wait'], ]; // Button to test the assertNoElementAfterWait() assertion, will fail. @@ -151,7 +151,7 @@ class JsWebAssertTestForm extends FormBase { $form['added_link'] = [ '#title' => 'Added link', '#type' => 'link', - '#url' => Url::fromRoute('js_webassert_test.js_webassert_test_form'), + '#url' => Url::fromRoute('jswebassert_test.jswebassert_test_form'), ]; return $form; } @@ -173,7 +173,7 @@ class JsWebAssertTestForm extends FormBase { */ public static function addId(array $form, FormStateInterface $form_state) { $form['added_id'] = [ - '#id' => 'js_webassert_test_field_id', + '#id' => 'jswebassert_test_field_id', '#type' => 'submit', '#value' => 'Added ID', '#button_type' => 'primary', @@ -186,7 +186,7 @@ class JsWebAssertTestForm extends FormBase { */ public static function addAssertWaitOnAjaxRequest(array $form, FormStateInterface $form_state) { // Attach the library necessary for this test. - $form['#attached']['library'][] = 'js_webassert_test/wait_for_ajax_request'; + $form['#attached']['library'][] = 'jswebassert_test/wait_for_ajax_request'; $form['test_assert_wait_on_ajax_input'] = [ '#type' => 'textfield', @@ -201,10 +201,10 @@ class JsWebAssertTestForm extends FormBase { */ public static function addWaitForElementVisible(array $form, FormStateInterface $form_state) { // Attach the library necessary for this test. - $form['#attached']['library'][] = 'js_webassert_test/wait_for_element'; + $form['#attached']['library'][] = 'jswebassert_test/wait_for_element'; $form['element_invisible'] = [ - '#id' => 'js_webassert_test_element_invisible', + '#id' => 'jswebassert_test_element_invisible', '#type' => 'submit', '#value' => 'Added WaitForElementVisible', '#button_type' => 'primary', diff --git a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php index f8ec258a207..240d3992170 100644 --- a/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php +++ b/core/modules/system/tests/src/Functional/Theme/ThemeInfoTest.php @@ -81,8 +81,8 @@ class ThemeInfoTest extends BrowserTestBase { $this->assertSession()->elementNotExists('xpath', '//link[contains(@href, "base-add.sub-remove.css")]'); // Verify that CSS files with the same name are loaded from both the base theme and subtheme. - $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $base . '/samename.css")]', 1); - $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $sub . '/samename.css")]', 1); + $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $base . '/same-name.css")]', 1); + $this->assertSession()->elementsCount('xpath', '//link[contains(@href, "' . $sub . '/same-name.css")]', 1); } diff --git a/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php b/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php index d737fe01017..13179844f97 100644 --- a/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php +++ b/core/modules/system/tests/src/Kernel/DateFormatAccessControlHandlerTest.php @@ -81,7 +81,7 @@ class DateFormatAccessControlHandlerTest extends KernelTestBase { \Drupal::setContainer($c); return [ - 'permissionless + unlocked' => [ + 'No permission + unlocked' => [ [], 'unlocked', AccessResult::allowed(), @@ -90,7 +90,7 @@ class DateFormatAccessControlHandlerTest extends KernelTestBase { AccessResult::neutral()->addCacheContexts(['user.permissions'])->setReason("The 'administer site configuration' permission is required.")->addCacheTags(['rendered']), AccessResult::neutral()->addCacheContexts(['user.permissions'])->setReason("The 'administer site configuration' permission is required."), ], - 'permissionless + locked' => [ + 'no permission + locked' => [ [], 'locked', AccessResult::allowed(), diff --git a/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php b/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php index 797d97daeee..93dc1c7868b 100644 --- a/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php +++ b/core/modules/system/tests/src/Kernel/MenuAccessControlHandlerTest.php @@ -74,7 +74,7 @@ class MenuAccessControlHandlerTest extends KernelTestBase { $assertions = ini_set('zend.assertions', 0); $data = [ - 'permissionless + unlocked' => [ + 'no permission + unlocked' => [ [], 'unlocked', AccessResult::allowed(), @@ -83,7 +83,7 @@ class MenuAccessControlHandlerTest extends KernelTestBase { AccessResult::neutral()->addCacheContexts(['user.permissions'])->setReason("The 'administer menu' permission is required.")->addCacheTags(['config:system.menu.llama']), AccessResult::neutral()->addCacheContexts(['user.permissions'])->setReason("The 'administer menu' permission is required."), ], - 'permissionless + locked' => [ + 'no permission + locked' => [ [], 'locked', AccessResult::allowed(), diff --git a/core/modules/system/tests/themes/test_basetheme/test_basetheme.libraries.yml b/core/modules/system/tests/themes/test_basetheme/test_basetheme.libraries.yml index b3d34064c4f..cda13204624 100644 --- a/core/modules/system/tests/themes/test_basetheme/test_basetheme.libraries.yml +++ b/core/modules/system/tests/themes/test_basetheme/test_basetheme.libraries.yml @@ -4,5 +4,5 @@ global-styling: base: base-add.css: {} base-add.sub-remove.css: {} - samename.css: {} + same-name.css: {} css/base-libraries-extend.css: {} diff --git a/core/modules/system/tests/themes/test_subtheme/test_subtheme.libraries.yml b/core/modules/system/tests/themes/test_subtheme/test_subtheme.libraries.yml index 1fff3900433..e7567cb3781 100644 --- a/core/modules/system/tests/themes/test_subtheme/test_subtheme.libraries.yml +++ b/core/modules/system/tests/themes/test_subtheme/test_subtheme.libraries.yml @@ -3,5 +3,5 @@ global-styling: css: base: css/sub-add.css: {} - css/samename.css: {} + css/same-name.css: {} css/sub-libraries-extend.css: {} diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderered_entity.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_rendered_entity.yml index f19870b1364..3466c3b8b15 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderered_entity.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_rendered_entity.yml @@ -5,8 +5,8 @@ dependencies: - core.entity_view_mode.node.default module: - node -id: test_entity_field_renderered_entity -label: test_entity_field_renderered_entity +id: test_entity_field_rendered_entity +label: test_entity_field_rendered_entity module: views description: '' tag: '' @@ -119,7 +119,7 @@ display: display_options: rendering_language: '***LANGUAGE_entity_translation***' display_extenders: { } - path: test_entity_field_renderered_entity/entity_translation + path: test_entity_field_rendered_entity/entity_translation cache_metadata: max-age: -1 contexts: @@ -134,7 +134,7 @@ display: display_options: rendering_language: '***LANGUAGE_entity_default***' display_extenders: { } - path: test_entity_field_renderered_entity/entity_default + path: test_entity_field_rendered_entity/entity_default cache_metadata: max-age: -1 contexts: @@ -149,7 +149,7 @@ display: display_options: rendering_language: '***LANGUAGE_site_default***' display_extenders: { } - path: test_entity_field_renderered_entity/site_default + path: test_entity_field_rendered_entity/site_default cache_metadata: max-age: -1 contexts: @@ -164,7 +164,7 @@ display: display_options: rendering_language: '***LANGUAGE_language_interface***' display_extenders: { } - path: test_entity_field_renderered_entity/language_interface + path: test_entity_field_rendered_entity/language_interface cache_metadata: max-age: -1 contexts: @@ -179,7 +179,7 @@ display: display_options: rendering_language: en display_extenders: { } - path: test_entity_field_renderered_entity/en + path: test_entity_field_rendered_entity/en cache_metadata: max-age: -1 contexts: @@ -194,7 +194,7 @@ display: display_options: rendering_language: es display_extenders: { } - path: test_entity_field_renderered_entity/es + path: test_entity_field_rendered_entity/es cache_metadata: max-age: -1 contexts: diff --git a/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php b/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php index fd9fac492c0..18cb35cb6bd 100644 --- a/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php +++ b/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php @@ -33,7 +33,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { /** * {@inheritdoc} */ - public static $testViews = ['test_entity_field_renderered_entity']; + public static $testViews = ['test_entity_field_rendered_entity']; /** * The entity type manager service. @@ -119,7 +119,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { // Views are sorted first by node id ascending, and then title ascending. // Confirm each node and node translation renders in its own language. - $this->drupalGet('test_entity_field_renderered_entity/entity_translation'); + $this->drupalGet('test_entity_field_rendered_entity/entity_translation'); $this->assertRows([ [ 'title' => 'example EN default', @@ -143,7 +143,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { // Confirm each node and node translation renders in the default language of // the node. - $this->drupalGet('test_entity_field_renderered_entity/entity_default'); + $this->drupalGet('test_entity_field_rendered_entity/entity_default'); $this->assertRows([ [ 'title' => 'example EN default', @@ -167,7 +167,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { // Confirm each node and node translation renders in the site's default // language (en), with fallback if node does not have en content. - $this->drupalGet('test_entity_field_renderered_entity/site_default'); + $this->drupalGet('test_entity_field_rendered_entity/site_default'); $this->assertRows([ [ 'title' => 'example EN default', @@ -191,7 +191,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { // Confirm each node and node translation renders in the site interface // language (en), with fallback if node does not have en content. - $this->drupalGet('test_entity_field_renderered_entity/language_interface'); + $this->drupalGet('test_entity_field_rendered_entity/language_interface'); $this->assertRows([ [ 'title' => 'example EN default', @@ -215,7 +215,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { // Confirm each node and node translation renders in the site interface // language (es), with fallback if node does not have es content. - $this->drupalGet('test_entity_field_renderered_entity/language_interface', ['language' => new Language(['id' => 'es'])]); + $this->drupalGet('test_entity_field_rendered_entity/language_interface', ['language' => new Language(['id' => 'es'])]); $this->assertRows([ [ 'title' => 'example ES translation', @@ -238,7 +238,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { ]); // Confirm each node and node translation renders in specified language en. - $this->drupalGet('test_entity_field_renderered_entity/en'); + $this->drupalGet('test_entity_field_rendered_entity/en'); $this->assertRows([ [ 'title' => 'example EN default', @@ -261,7 +261,7 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase { ]); // Confirm each node and node translation renders in specified language es. - $this->drupalGet('test_entity_field_renderered_entity/es'); + $this->drupalGet('test_entity_field_rendered_entity/es'); $this->assertRows([ [ 'title' => 'example ES translation', diff --git a/core/modules/views/tests/src/Kernel/TestViewsTest.php b/core/modules/views/tests/src/Kernel/TestViewsTest.php index 9e46c42d6f3..99118d2530b 100644 --- a/core/modules/views/tests/src/Kernel/TestViewsTest.php +++ b/core/modules/views/tests/src/Kernel/TestViewsTest.php @@ -151,7 +151,7 @@ class TestViewsTest extends KernelTestBase { // @see core/modules/views/tests/modules/views_test_config/test_views/views.view.test_exposed_form_checkboxes.yml Vocabulary::create(['vid' => 'test_exposed_checkboxes', 'name' => 'Exposed checkboxes test'])->save(); // `core.entity_view_mode.node.default` is a config dependency. - // @see core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_renderered_entity.yml + // @see core/modules/views/tests/modules/views_test_config/test_views/views.view.test_entity_field_rendered_entity.yml EntityViewMode::create([ 'id' => 'node.default', 'label' => 'Default', diff --git a/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php index b6a9906524b..173518419e2 100644 --- a/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php +++ b/core/profiles/demo_umami/tests/src/Functional/DemoUmamiProfileTest.php @@ -168,7 +168,7 @@ class DemoUmamiProfileTest extends BrowserTestBase { ]; $account = $this->drupalCreateUser($permissions); $this->drupalLogin($account); - $webassert = $this->assertSession(); + $assert_session = $this->assertSession(); // Check that admin is able to edit the node. $nodes = $this->container->get('entity_type.manager') @@ -176,15 +176,15 @@ class DemoUmamiProfileTest extends BrowserTestBase { ->loadByProperties(['title' => 'Deep mediterranean quiche']); $node = reset($nodes); $this->drupalGet($node->toUrl('edit-form')); - $webassert->statusCodeEquals(200); + $assert_session->statusCodeEquals(200); $this->submitForm([], 'Preview'); - $webassert->statusCodeEquals(200); + $assert_session->statusCodeEquals(200); $this->assertSession()->elementsCount('css', 'h1', 1); $this->clickLink('Back to content editing'); $this->submitForm([], "Save"); - $webassert->pageTextContains('Recipe Deep mediterranean quiche has been updated.'); + $assert_session->pageTextContains('Recipe Deep mediterranean quiche has been updated.'); } /** @@ -193,10 +193,10 @@ class DemoUmamiProfileTest extends BrowserTestBase { protected function testAppearance() { $account = $this->drupalCreateUser(['administer themes']); $this->drupalLogin($account); - $webassert = $this->assertSession(); + $assert_session = $this->assertSession(); $this->drupalGet('admin/appearance'); - $webassert->pageTextContains('Umami'); + $assert_session->pageTextContains('Umami'); } /** diff --git a/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php b/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php index 07d84d19fc4..c1c8d60267a 100644 --- a/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php +++ b/core/tests/Drupal/FunctionalJavascriptTests/Tests/JSWebAssertTest.php @@ -21,7 +21,7 @@ class JSWebAssertTest extends WebDriverTestBase { * * @var array */ - protected static $modules = ['js_webassert_test']; + protected static $modules = ['jswebassert_test']; /** * {@inheritdoc} @@ -32,7 +32,7 @@ class JSWebAssertTest extends WebDriverTestBase { * Tests that JSWebAssert assertions work correctly. */ public function testJsWebAssert(): void { - $this->drupalGet('js_webassert_test_form'); + $this->drupalGet('jswebassert_test_form'); $session = $this->getSession(); $assert_session = $this->assertSession(); @@ -91,10 +91,10 @@ class JSWebAssertTest extends WebDriverTestBase { $this->assertNotEmpty($result); $this->assertInstanceOf(NodeElement::class, $result); - $result = $page->findById('js_webassert_test_field_id'); + $result = $page->findById('jswebassert_test_field_id'); $this->assertEmpty($result); $test_id->click(); - $result = $assert_session->waitForId('js_webassert_test_field_id'); + $result = $assert_session->waitForId('jswebassert_test_field_id'); $this->assertNotEmpty($result); $this->assertInstanceOf(NodeElement::class, $result); @@ -107,7 +107,7 @@ class JSWebAssertTest extends WebDriverTestBase { $result = $page->findField('test_assert_wait_on_ajax_input'); $this->assertNotEmpty($result); $this->assertInstanceOf(NodeElement::class, $result); - $this->assertEquals('js_webassert_test', $result->getValue()); + $this->assertEquals('jswebassert_test', $result->getValue()); $result = $page->findButton('Added WaitForElementVisible'); $this->assertEmpty($result); @@ -117,7 +117,7 @@ class JSWebAssertTest extends WebDriverTestBase { $this->assertInstanceOf(NodeElement::class, $result); $this->assertEquals(TRUE, $result->isVisible()); - $this->drupalGet('js_webassert_test_page'); + $this->drupalGet('jswebassert_test_page'); // Ensure that the javascript has replaced the element 1100 times. $assert_session->waitForText('New Text!! 1100'); $result = $page->find('named', ['id', 'test_text']); diff --git a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php index db25caf24b3..8577f97f9d9 100644 --- a/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php +++ b/core/tests/Drupal/FunctionalTests/BrowserTestBaseTest.php @@ -237,13 +237,13 @@ class BrowserTestBaseTest extends BrowserTestBase { $this->assertSession()->fieldValueEquals('edit-name', 'Test name'); $this->assertSession()->fieldValueEquals('edit-options', '2'); - $this->assertSession()->elementNotExists('xpath', '//notexisting'); + $this->assertSession()->elementNotExists('xpath', '//nonexisting'); $this->assertSession()->fieldValueNotEquals('edit-name', 'wrong value'); // Test that the assertion fails correctly. try { - $this->assertSession()->fieldExists('notexisting'); - $this->fail('The "notexisting" field was found.'); + $this->assertSession()->fieldExists('nonexisting'); + $this->fail('The "nonexisting" field was found.'); } catch (ExpectationException) { // Expected exception; just continue testing. @@ -299,7 +299,7 @@ class BrowserTestBaseTest extends BrowserTestBase { } // *** 3. assertNoFieldById(). $this->assertSession()->fieldValueNotEquals('name', 'not the value'); - $this->assertSession()->fieldNotExists('notexisting'); + $this->assertSession()->fieldNotExists('nonexisting'); // Test that the assertion fails correctly if no value is passed in. try { $this->assertSession()->fieldNotExists('edit-description'); diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php index f997950b120..52fb88086d4 100644 --- a/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php +++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImporterTest.php @@ -525,9 +525,9 @@ class ConfigImporterTest extends KernelTestBase { * Tests the isInstallable method() */ public function testIsInstallable(): void { - $config_name = 'config_test.dynamic.isinstallable'; + $config_name = 'config_test.dynamic.is_installable'; $this->assertFalse($this->container->get('config.storage')->exists($config_name)); - \Drupal::state()->set('config_test.isinstallable', TRUE); + \Drupal::state()->set('config_test.is_installable', TRUE); $this->installConfig(['config_test']); $this->assertTrue($this->container->get('config.storage')->exists($config_name)); } diff --git a/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php index 0217513df6d..ff725923c0e 100644 --- a/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php +++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityFieldTest.php @@ -503,9 +503,9 @@ class EntityFieldTest extends EntityKernelTestBase { $name_properties = $entity->name->getFieldDefinition()->getPropertyDefinitions(); $this->assertEquals('string', $name_properties['value']->getDataType(), $entity_type . ': String value property of the name found.'); - $userref_properties = $entity->user_id->getFieldDefinition()->getPropertyDefinitions(); - $this->assertEquals('integer', $userref_properties['target_id']->getDataType(), $entity_type . ': Entity id property of the user found.'); - $this->assertEquals('entity_reference', $userref_properties['entity']->getDataType(), $entity_type . ': Entity reference property of the user found.'); + $user_ref_properties = $entity->user_id->getFieldDefinition()->getPropertyDefinitions(); + $this->assertEquals('integer', $user_ref_properties['target_id']->getDataType(), $entity_type . ': Entity id property of the user found.'); + $this->assertEquals('entity_reference', $user_ref_properties['entity']->getDataType(), $entity_type . ': Entity reference property of the user found.'); $textfield_properties = $entity->field_test_text->getFieldDefinition()->getFieldStorageDefinition()->getPropertyDefinitions(); $this->assertEquals('string', $textfield_properties['value']->getDataType(), $entity_type . ': String value property of the test-text field found.'); diff --git a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php index b61bd1e4b65..a18dea81a2c 100644 --- a/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php +++ b/core/tests/Drupal/Tests/Core/Asset/CssOptimizerUnitTest.php @@ -142,8 +142,8 @@ class CssOptimizerUnitTest extends UnitTestCase { 'weight' => 0.013, 'media' => 'all', 'preprocess' => TRUE, - 'data' => $path . 'charset_sameline.css', - 'basename' => 'charset_sameline.css', + 'data' => $path . 'charset_same_line.css', + 'basename' => 'charset_same_line.css', ], file_get_contents($absolute_path . 'charset.css.optimized.css'), ], diff --git a/core/tests/Drupal/Tests/Core/Asset/css_test_files/charset_sameline.css b/core/tests/Drupal/Tests/Core/Asset/css_test_files/charset_same_line.css index ba7696ddf44..ba7696ddf44 100644 --- a/core/tests/Drupal/Tests/Core/Asset/css_test_files/charset_sameline.css +++ b/core/tests/Drupal/Tests/Core/Asset/css_test_files/charset_same_line.css |