Merge remote-tracking branch 'origin/2.4.9-alpha3-develop' into AC-15627

Author: glo60612

app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist-mixin.js

@@ -11,22 +11,52 @@ define(['jquery', 'Magento_Customer/js/customer-data'], function ($, customerDat
             initialize: function () {
                 this._super();
 
+                let updateTimer = null;
+
                 const selector = '.wishlist .counter.qty, .customer-menu .wishlist .counter, .link.wishlist .counter',
-                    wishlist = customerData.get('wishlist');
+                    wishlist = customerData.get('wishlist'),
+                    clearPeriodicCounterUpdate = function () {
+                        if (updateTimer) {
+                            clearInterval(updateTimer);
+                            updateTimer = null;
+                        }
+                    },
+                    updateCounters = function (updatedWishlist) {
+                        const counters = $(selector);
 
-                wishlist.subscribe(function (updatedWishlist) {
-                    const counters = $(selector);
+                        if (typeof updatedWishlist.counter !== 'undefined'
+                            && updatedWishlist.counter !== null
+                            && counters.length
+                        ) {
+                            const expectedText = updatedWishlist.counter.toString(),
+                                currentText = counters.first().text().trim();
 
-                    if (typeof updatedWishlist.counter !== 'undefined'
-                        && updatedWishlist.counter !== null
-                        && counters.length
-                    ) {
-                        counters.text(updatedWishlist.counter);
-                    }
-                    if (updatedWishlist.counter === null) {
-                        counters.hide();
+                            // Check if text is already correct
+                            if (currentText === expectedText) {
+                                clearPeriodicCounterUpdate();
+                                return;
+                            }
+
+                            counters.text(updatedWishlist.counter);
+                            counters.show();
+                        }
+                        if (updatedWishlist.counter === null) {
+                            clearPeriodicCounterUpdate();
+                            counters.hide();
+                        }
+                    };
+
+                // Subscribe to future wishlist changes
+                wishlist.subscribe(updateCounters);
+
+                // Simple timer to periodically update counters
+                updateTimer = setInterval(function () {
+                    const wishlistData = wishlist();
+
+                    if (wishlistData && typeof wishlistData.counter !== 'undefined') {
+                        updateCounters(wishlistData);
                     }
-                });
+                }, 1000);
 
                 return this;
             }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductRepositoryInterfaceTest.php

@@ -1092,7 +1092,7 @@ public function testGetListWithFilteringByWebsite()
 
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/products_with_websites_and_stores.php
-     * @dataProvider testGetListWithFilteringByStoreDataProvider
+     * @dataProvider getListWithFilteringByStoreDataProvider
      *
      * @param array $searchCriteria
      * @param array $skus
@@ -1137,7 +1137,7 @@ public function testGetListWithFilteringByStore(array $searchCriteria, array $sk
      *
      * @return array
      */
-    public static function testGetListWithFilteringByStoreDataProvider()
+    public static function getListWithFilteringByStoreDataProvider()
     {
         return [
             [

dev/tests/api-functional/testsuite/Magento/Customer/Api/GroupRepositoryTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2016 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Customer\Api;
@@ -171,7 +171,7 @@ public function testCreateGroupRest()
     /**
      * Verify that creating a new group with excluded website as extension attributes works via REST.
      *
-     * @dataProvider testExcludedWebsitesRestDataProvider
+     * @dataProvider excludedWebsitesRestDataProvider
      * @param string $code
      * @param null|array $excludeWebsitesIds
      * @param null|array $result
@@ -223,7 +223,7 @@ public function testCreateGroupWithExcludedWebsiteRest(
      *
      * @return array
      */
-    public static function testExcludedWebsitesRestDataProvider(): array
+    public static function excludedWebsitesRestDataProvider(): array
     {
         return [
             ['Create Group No Excludes REST', [], null],
@@ -612,7 +612,7 @@ public function testCreateGroupSoap()
     /**
      * Verify that creating a new group with excluded website as extension attributes works via SOAP.
      *
-     * @dataProvider testExcludedWebsitesSoapDataProvider
+     * @dataProvider excludedWebsitesSoapDataProvider
      * @param string $code
      * @param array $excludeWebsitesIds
      * @param array|null $result
@@ -665,7 +665,7 @@ public function testCreateGroupWithExcludedWebsiteSoap(
      *
      * @return array
      */
-    public static function testExcludedWebsitesSoapDataProvider(): array
+    public static function excludedWebsitesSoapDataProvider(): array
     {
         return [
             ['Create Group No Excludes SOAP', [], null],
@@ -1092,7 +1092,7 @@ private function createGroup($group)
     /**
      * Data provider for testSearchGroups
      */
-    public static function testSearchGroupsDataProvider()
+    public static function searchGroupsDataProvider()
     {
         return [
             ['tax_class_id', 3, []],
@@ -1148,7 +1148,7 @@ public static function testSearchGroupsDataProvider()
      * @param string $filterValue Value of the field to be filtered by
      * @param array $expectedResult Expected search result
      *
-     * @dataProvider testSearchGroupsDataProvider
+     * @dataProvider searchGroupsDataProvider
      */
     public function testSearchGroups($filterField, $filterValue, $expectedResult)
     {
@@ -1248,7 +1248,7 @@ public function testSearchGroupsWithMultipleFilterGroupsAndSorting()
      * @param string $filterValue Value of the field to be filtered by
      * @param array $expectedResult Expected search result
      *
-     * @dataProvider testSearchGroupsDataProvider
+     * @dataProvider searchGroupsDataProvider
      */
     public function testSearchGroupsWithGET($filterField, $filterValue, $expectedResult)
     {

dev/tests/js/jasmine/tests/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist-mixin.test.js

@@ -25,9 +25,11 @@ define([
                 subscribeCallback = callback;
             }
 
-            wishlistDataMock = {
-                subscribe: jasmine.createSpy('subscribe').and.callFake(setupSubscribeCallback)
-            };
+            // Create wishlistDataMock as a function (KnockoutJS observable) with subscribe method
+            wishlistDataMock = jasmine.createSpy('wishlistObservable').and.returnValue({
+                counter: null // Default return value
+            });
+            wishlistDataMock.subscribe = jasmine.createSpy('subscribe').and.callFake(setupSubscribeCallback);
 
             customerDataMock.get.and.returnValue(wishlistDataMock);