Skip to content
Snippets Groups Projects
Verified Commit 239e6f63 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
parent 6e7a6741
No related branches found
No related tags found
20 merge requests!11131[10.4.x-only-DO-NOT-MERGE]: Issue ##2842525 Ajax attached to Views exposed filter form does not trigger callbacks,!9470[10.3.x-only-DO-NOT-MERGE]: #3331771 Fix file_get_contents(): Passing null to parameter,!8736Update the Documention As per the Function uses.,!8513Issue #3453786: DefaultSelection should document why values for target_bundles NULL and [] behave as they do,!3878Removed unused condition head title for views,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2964Issue #2865710 : Dependencies from only one instance of a widget are used in display modes,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2062Issue #3246454: Add weekly granularity to views date sort,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #262058 passed with warnings
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#262061

    Hide whitespace changes
    Inline Side-by-side
    core/tests/Drupal/Tests/Core/Asset/AssetResolverTest.php
    + 17
    − 20
    View file @ 239e6f63
    ......@@ -178,15 +178,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());
    ......@@ -213,16 +213,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());
    ......@@ -245,7 +242,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.
    Finish editing this message first!
    Please register or to comment