diff --git a/core/drupalci.yml b/core/drupalci.yml index ed02d43c63..3f3b15426d 100644 --- a/core/drupalci.yml +++ b/core/drupalci.yml @@ -3,57 +3,10 @@ # https://www.drupal.org/drupalorg/docs/drupal-ci/customizing-drupalci-testing build: assessment: - validate_codebase: - phplint: - csslint: - halt-on-fail: false - eslint: - # A test must pass eslinting standards check in order to continue processing. - halt-on-fail: false - phpcs: - # phpcs will use core's specified version of Coder. - sniff-all-files: false - halt-on-fail: false testing: - # run_tests task is executed several times in order of performance speeds. - # halt-on-fail can be set on the run_tests tasks in order to fail fast. - # suppress-deprecations is false in order to be alerted to usages of - # deprecated code. - run_tests.phpunit: - types: 'PHPUnit-Unit' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.kernel: - types: 'PHPUnit-Kernel' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.simpletest: - types: 'Simpletest' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.build: - types: 'PHPUnit-Build' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false - run_tests.functional: - types: 'PHPUnit-Functional' - testgroups: '--all' - suppress-deprecations: false - halt-on-fail: false run_tests.javascript: concurrency: 15 types: 'PHPUnit-FunctionalJavascript' - testgroups: '--all' + testgroups: '--class "Drupal\Tests\media_library\FunctionalJavascript\MediaLibraryTest"' suppress-deprecations: false halt-on-fail: false - # Run nightwatch testing. - # @see https://www.drupal.org/project/drupal/issues/2869825 - nightwatchjs: -# container_command.drupal_project_templates: -# commands: -# - "sudo -u www-data ${SOURCE_DIR}/core/tests/scripts/test_composer_project_templates.sh" -# halt-on-fail: true diff --git a/core/modules/media_library/js/media_library.ui.es6.js b/core/modules/media_library/js/media_library.ui.es6.js index f896f59a50..59f1b71e61 100644 --- a/core/modules/media_library/js/media_library.ui.es6.js +++ b/core/modules/media_library/js/media_library.ui.es6.js @@ -142,7 +142,7 @@ .addClass('active') .html( Drupal.t( - '@title', + '@title', { '@title': $(e.currentTarget).data('title') }, ), ); diff --git a/core/modules/media_library/js/media_library.ui.js b/core/modules/media_library/js/media_library.ui.js index 9573e94cff..86beee1aab 100644 --- a/core/modules/media_library/js/media_library.ui.js +++ b/core/modules/media_library/js/media_library.ui.js @@ -76,7 +76,7 @@ $menu.find('.active-tab').remove(); $menu.find('a').removeClass('active'); - $(e.currentTarget).addClass('active').html(Drupal.t('@title', { '@title': $(e.currentTarget).data('title') })); + $(e.currentTarget).addClass('active').html(Drupal.t('@title', { '@title': $(e.currentTarget).data('title') })); Drupal.announce(Drupal.t('Showing @title media.', { '@title': $(e.currentTarget).data('title') diff --git a/core/modules/media_library/src/MediaLibraryUiBuilder.php b/core/modules/media_library/src/MediaLibraryUiBuilder.php index b5e30c36f3..d96f54df1b 100644 --- a/core/modules/media_library/src/MediaLibraryUiBuilder.php +++ b/core/modules/media_library/src/MediaLibraryUiBuilder.php @@ -253,11 +253,11 @@ protected function buildMediaTypeMenu(MediaLibraryState $state) { $title = $allowed_type->label(); $display_title = [ - '#markup' => $this->t('@title', ['@title' => $title]), + '#markup' => $title, ]; if ($allowed_type_id === $selected_type_id) { $display_title = [ - '#markup' => $this->t('@title', ['@title' => $title]), + '#markup' => $this->t('@title', ['@title' => $title]), ]; } diff --git a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php index 5f9fb1df3b..c00d726af1 100644 --- a/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php +++ b/core/modules/media_library/tests/src/FunctionalJavascript/MediaLibraryTest.php @@ -445,14 +445,14 @@ public function testWidget() { // Assert that the media type menu is available when more than 1 type is // configured for the field. $menu = $this->openMediaLibraryForField('field_unlimited_media'); - $this->assertTrue($menu->hasLink('Show Type One media (selected)')); + $this->assertTrue($menu->hasLink('Type One (selected)')); $this->assertFalse($menu->hasLink('Type Two')); $this->assertTrue($menu->hasLink('Type Three')); $this->assertFalse($menu->hasLink('Type Four')); $this->switchToMediaType('Three'); // Assert the active tab is set correctly. - $this->assertFalse($menu->hasLink('Show Type One media (selected)')); - $this->assertTrue($menu->hasLink('Show Type Three media (selected)')); + $this->assertFalse($menu->hasLink('Type One (selected)')); + $this->assertTrue($menu->hasLink('Type Three (selected)')); // Assert the focus is set to the first tabbable element when a vertical tab // is clicked. $this->assertJsCondition('jQuery("#media-library-content :tabbable:first").is(":focus")'); @@ -496,7 +496,7 @@ public function testWidget() { foreach ($links as $link) { $link_titles[] = $link->getText(); } - $expected_link_titles = ['Show Type Three media (selected)', 'Show Type One media', 'Show Type Two media', 'Show Type Four media']; + $expected_link_titles = ['Type Three (selected)', 'Type One', 'Type Two', 'Type Four']; $this->assertSame($link_titles, $expected_link_titles); $this->drupalGet('admin/structure/types/manage/basic_page/form-display'); $assert_session->buttonExists('field_twin_media_settings_edit')->press(); @@ -512,7 +512,7 @@ public function testWidget() { $link_titles = array_map(function ($link) { return $link->getText(); }, $links); - $this->assertSame($link_titles, ['Show Type One media (selected)', 'Show Type Three media', 'Show Type Four media', 'Show Type Two media']); + $this->assertSame($link_titles, ['Type One (selected)', 'Type Three', 'Type Four', 'Type Two']); $assert_session->elementExists('css', '.ui-dialog-titlebar-close')->click(); // Assert the announcements for media type navigation in the media library. @@ -533,7 +533,7 @@ public function testWidget() { $assert_session->pageTextNotContains('Turtle'); $this->switchToMediaType('Three'); $this->assertNotEmpty($assert_session->waitForText('Showing Type Three media.')); - $assert_session->elementExists('named', ['link', 'Show Type Three media (selected)']); + $assert_session->elementExists('named', ['link', 'Type Three (selected)']); $assert_session->pageTextNotContains('Dog'); $assert_session->pageTextNotContains('Bear'); $assert_session->pageTextNotContains('Turtle'); @@ -2105,7 +2105,7 @@ protected function getTypesMenu() { */ protected function switchToMediaType($type) { $link = $this->assertSession() - ->elementExists('named', ['link', "Type $type"], $this->getTypesMenu()); + ->elementExists('css', "a:contains(Type $type)", $this->getTypesMenu()); if ($link->hasClass('active')) { // There is nothing to do as the type is already active.