Skip to content
Snippets Groups Projects
Verified Commit 8d9b6739 authored by Dave Long's avatar Dave Long
Browse files

Issue #3468781 by Spokje, catch, mondrake: AssetResolverTest should use... 

Issue #3468781 by Spokje, catch, mondrake: AssetResolverTest should use ::willReturnMap() for mocking

(cherry picked from commit 239e6f63)
parent cf5738bc
No related branches found
No related tags found
17 merge requests!10663Issue #3495778: Update phpdoc in FileSaveHtaccessLoggingTest,!10451Issue #3472458 by watergate, smustgrave: CKEditor 5 show blocks label is not translated,!103032838547 Fix punctuation rules for inline label suffix colon with CSS only,!10150Issue #3467294 by quietone, nod_, smustgrave, catch, longwave: Change string...,!10130Resolve #3480321 "Second level menu",!9936Issue #3483087: Check the module:// prefix in the translation server path and replace it with the actual module path,!9933Issue #3394728 by ankondrat4: Undefined array key "#prefix" and deprecated function: explode() in Drupal\file\Element\ManagedFile::uploadAjaxCallback(),!9914Issue #3451136 by quietone, gapple, ghost of drupal past: Improve...,!9882Draft: Issue #3481777 In bulk_form ensure the triggering element is the bulk_form button,!9839Issue #3445469 by pooja_sharma, smustgrave: Add additional test coverage for...,!9815Issue #3480025: There is no way to remove entity cache items,!9757Issue #3478869 Add "All" or overview links to parent links,!9752Issue #3439910 by pooja_sharma, vensires: Fix Toolbar tests that rely on UID1's super user behavior,!9749Issue #3439910 by pooja_sharma, vensires: Fix Toolbar tests that rely on UID1's super user behavior,!9678Issue #3465132 by catch, Spokje, nod_: Show test run time by class in run-tests.sh output,!9578Issue #3304746 by scott_euser, casey, smustgrave: BigPipe cannot handle (GET)...,!9449Issue #3344041: Allow textarea widgets to be used for text (formatted) fields
Pipeline #262064 canceled
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#262066

    Hide whitespace changes
    Inline Side-by-side
    core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
    + 17
    − 20
    View file @ 8d9b6739
    ......@@ -169,15 +169,15 @@ protected function setUp(): void {
    * @dataProvider providerAttachedCssAssets
    */
    public function testGetCssAssets(AttachedAssetsInterface $assets_a, AttachedAssetsInterface $assets_b, $expected_css_cache_item_count): void {
    $this->libraryDiscovery->expects($this->any())
    ->method('getLibraryByName')
    ->willReturnOnConsecutiveCalls(
    $this->libraries['drupal'],
    $this->libraries['llama'],
    $this->libraries['llama'],
    $this->libraries['piggy'],
    $this->libraries['piggy'],
    );
    $map = [
    ['core', 'drupal', $this->libraries['drupal']],
    ['core', 'jquery', $this->libraries['jquery']],
    ['llama', 'css', $this->libraries['llama']],
    ['piggy', 'css', $this->libraries['piggy']],
    ];
    $this->libraryDiscovery->method('getLibraryByName')
    ->willReturnMap($map);
    $this->assetResolver->getCssAssets($assets_a, FALSE, $this->english);
    $this->assetResolver->getCssAssets($assets_b, FALSE, $this->english);
    $this->assertCount($expected_css_cache_item_count, $this->cache->getAllCids());
    ......@@ -204,16 +204,13 @@ public static function providerAttachedCssAssets() {
    * @dataProvider providerAttachedJsAssets
    */
    public function testGetJsAssets(AttachedAssetsInterface $assets_a, AttachedAssetsInterface $assets_b, $expected_js_cache_item_count, $expected_multilingual_js_cache_item_count): void {
    $this->libraryDiscovery->expects($this->any())
    ->method('getLibraryByName')
    ->willReturnOnConsecutiveCalls(
    $this->libraries['drupal'],
    $this->libraries['drupal'],
    $this->libraries['jquery'],
    $this->libraries['drupal'],
    $this->libraries['drupal'],
    $this->libraries['jquery'],
    );
    $map = [
    ['core', 'drupal', $this->libraries['drupal']],
    ['core', 'jquery', $this->libraries['jquery']],
    ];
    $this->libraryDiscovery->method('getLibraryByName')
    ->willReturnMap($map);
    $this->assetResolver->getJsAssets($assets_a, FALSE, $this->english);
    $this->assetResolver->getJsAssets($assets_b, FALSE, $this->english);
    $this->assertCount($expected_js_cache_item_count, $this->cache->getAllCids());
    ......@@ -236,7 +233,7 @@ public static function providerAttachedJsAssets() {
    (new AttachedAssets())->setAlreadyLoadedLibraries([])->setLibraries(['core/drupal'])->setSettings(['currentTime' => $time]),
    (new AttachedAssets())->setAlreadyLoadedLibraries([])->setLibraries(['core/drupal', 'core/jquery'])->setSettings(['currentTime' => $time]),
    2,
    3,
    4,
    ],
    ];
    }
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Please register or to comment