X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Ftests%2FDrupal%2FTests%2FCore%2FAsset%2FAssetResolverTest.php;fp=web%2Fcore%2Ftests%2FDrupal%2FTests%2FCore%2FAsset%2FAssetResolverTest.php;h=05aff5e93c018124cb38c1dc213857670c6fadc1;hp=6ed63aa952eb05f343ed0f2661d8f975d8684fb0;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c diff --git a/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php b/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php index 6ed63aa95..05aff5e93 100644 --- a/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php +++ b/web/core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php @@ -114,6 +114,12 @@ class AssetResolverTest extends UnitTestCase { /** * @covers ::getCssAssets * @dataProvider providerAttachedAssets + * @group legacy + * + * Note the legacy group is used here because + * ActiveTheme::getStyleSheetsRemove() is called and is deprecated. As this + * code path will still be triggered until Drupal 9 we have to add the group. + * We do not trigger a silenced deprecation. */ public function testGetCssAssets(AttachedAssetsInterface $assets_a, AttachedAssetsInterface $assets_b, $expected_cache_item_count) { $this->assetResolver->getCssAssets($assets_a, FALSE); @@ -141,12 +147,12 @@ class AssetResolverTest extends UnitTestCase { 'same libraries, different timestamps' => [ (new AttachedAssets())->setAlreadyLoadedLibraries([])->setLibraries(['core/drupal'])->setSettings(['currentTime' => $time]), (new AttachedAssets())->setAlreadyLoadedLibraries([])->setLibraries(['core/drupal'])->setSettings(['currentTime' => $time + 100]), - 1 + 1, ], 'different libraries, same timestamps' => [ (new AttachedAssets())->setAlreadyLoadedLibraries([])->setLibraries(['core/drupal'])->setSettings(['currenttime' => $time]), (new AttachedAssets())->setAlreadyLoadedLibraries([])->setLibraries(['core/drupal', 'core/jquery'])->setSettings(['currentTime' => $time]), - 2 + 2, ], ]; } @@ -162,6 +168,7 @@ if (!defined('JS_DEFAULT')) { } class TestMemoryBackend extends MemoryBackend { + public function getAllCids() { return array_keys($this->cache); }