.../system/tests/themes/test_theme/test_theme.info.yml | 8 ++++---- .../Core/Asset/LibraryDiscoveryIntegrationTest.php | 13 ++++--------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/core/modules/system/tests/themes/test_theme/test_theme.info.yml b/core/modules/system/tests/themes/test_theme/test_theme.info.yml index 1953f96fb3..36eba299be 100644 --- a/core/modules/system/tests/themes/test_theme/test_theme.info.yml +++ b/core/modules/system/tests/themes/test_theme/test_theme.info.yml @@ -38,9 +38,9 @@ libraries-override: component: /core/themes/stable9/css/system/components/js.module.css: false # It works for JS as well. - core/jquery: + core/drupal.batch: js: - assets/vendor/jquery/jquery.min.js: js/collapse.js + misc/batch.js: js/collapse.js # Use Drupal-relative paths. core/drupal.dropbutton: css: @@ -56,9 +56,9 @@ libraries-override: js: misc/displace.js: //my-server/my_theme/js/overridden.js # Use an absolute URI. - core/loadjs: + core/js-cookie: js: - assets/vendor/loadjs/loadjs.min.js: http://example.com/my_theme/js/loadjs.min.js + assets/vendor/js-cookie/js.cookie.min.js: http://example.com/my_theme/js/js.cookie.min.js regions: content: Content diff --git a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php index d6afcbea5f..783b16220c 100644 --- a/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php +++ b/core/tests/Drupal/KernelTests/Core/Asset/LibraryDiscoveryIntegrationTest.php @@ -86,14 +86,9 @@ public function testLibrariesOverride() { $this->assertFalse($this->libraryDiscovery->getLibraryByName('core', 'drupal.progress'), 'Entire library correctly removed.'); // Assert that overridden library asset still retains attributes. - $library = $this->libraryDiscovery->getLibraryByName('core', 'jquery'); - foreach ($library['js'] as $definition) { - if ($definition['data'] == 'core/modules/system/tests/themes/test_theme/js/collapse.js') { - $this->assertTrue($definition['minified']); - $this->assertSame(-20, $definition['weight'], 'Previous attributes retained'); - break; - } - } + $library = $this->libraryDiscovery->getLibraryByName('core', 'drupal.batch'); + $this->assertSame('core/modules/system/tests/themes/test_theme/js/collapse.js', $library['js'][0]['data']); + $this->assertSame(FALSE, $library['js'][0]['cache']); } /** @@ -150,7 +145,7 @@ public function testLibrariesOverrideOtherAssetLibraryNames() { $this->assertAssetInLibrary('//my-server/my_theme/js/overridden.js', 'core', 'drupal.displace', 'js'); // Assert an absolute URI. - $this->assertAssetInLibrary('http://example.com/my_theme/js/loadjs.min.js', 'core', 'loadjs', 'js'); + $this->assertAssetInLibrary('http://example.com/my_theme/js/js.cookie.min.js', 'core', 'js-cookie', 'js'); } /**