Merge branch '2.4-develop' into platform-health

Author: xmav

dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php

@@ -1616,11 +1616,16 @@ public function testFilterProductsBySingleCategoryId(string $fieldName, string $
     /**
      * Sorting the search results by relevance (DESC => most relevant)
      *
+     * Sorting by relevance may return different results depending on the ES.
+     * To check that sorting works, we compare results with ASC and DESC relevance sorting
+     *
      * Search for products for a fuzzy match and checks if all matching results returned including
      * results based on matching keywords from description
      *
      * @magentoApiDataFixture Magento/Catalog/_files/products_for_relevance_sorting.php
      * @return void
+     *
+     * @throws \Exception
      */
     public function testSearchAndSortByRelevance()
     {
@@ -1630,7 +1635,7 @@ public function testSearchAndSortByRelevance()
 {
   products(
         search:"{$search_term}"
-        sort:{relevance:DESC}
+        sort:{relevance:%s}
         pageSize: 5
         currentPage: 1
        )
@@ -1671,16 +1676,16 @@ public function testSearchAndSortByRelevance()
 
 }
 QUERY;
-        $response = $this->graphQlQuery($query);
-        $this->assertEquals(3, $response['products']['total_count']);
-        $this->assertNotEmpty($response['products']['filters'], 'Filters should have the Category layer');
-        $this->assertEquals('Colorful Category', $response['products']['filters'][0]['filter_items'][0]['label']);
-        $this->assertCount(2, $response['products']['aggregations']);
-        $productsInResponse = ['Blue briefs', 'Navy Blue Striped Shoes', 'Grey shorts'];
-        $count = count($response['products']['items']);
-        for ($i = 0; $i < $count; $i++) {
-            $this->assertEquals($productsInResponse[$i], $response['products']['items'][$i]['name']);
-        }
+        $responseDesc = $this->graphQlQuery(sprintf($query, 'DESC'));
+        $responseAsc = $this->graphQlQuery(sprintf($query, 'ASC'));
+        $this->assertEquals(3, $responseDesc['products']['total_count']);
+        $this->assertNotEmpty($responseDesc['products']['filters'], 'Filters should have the Category layer');
+        $this->assertEquals('Colorful Category', $responseDesc['products']['filters'][0]['filter_items'][0]['label']);
+        $this->assertCount(2, $responseDesc['products']['aggregations']);
+        $expectedProductsInResponse = ['Blue briefs', 'Navy Blue Striped Shoes', 'Grey shorts'];
+        $namesDesc = array_column($responseDesc['products']['items'], 'name');
+        $this->assertEqualsCanonicalizing($expectedProductsInResponse, $namesDesc);
+        $this->assertEquals($namesDesc, array_reverse(array_column($responseAsc['products']['items'], 'name')));
     }
 
     /**

dev/tests/integration/testsuite/Magento/Elasticsearch/Model/Indexer/ReindexAllTest.php

@@ -144,29 +144,25 @@ public function testSortCaseSensitive(): void
         $productThird = $this->productRepository->get('fulltext-3');
         $productFourth = $this->productRepository->get('fulltext-4');
         $productFifth = $this->productRepository->get('fulltext-5');
-        $correctSortedIds = [
-            $productFirst->getId(),
-            $productFourth->getId(),
-            $productSecond->getId(),
-            $productFifth->getId(),
-            $productThird->getId(),
-        ];
+
         $this->reindexAll();
         $result = $this->sortByName();
         $firstInSearchResults = (int) $result[0]['_id'];
         $secondInSearchResults = (int) $result[1]['_id'];
         $thirdInSearchResults = (int) $result[2]['_id'];
         $fourthInSearchResults = (int) $result[3]['_id'];
         $fifthInSearchResults = (int) $result[4]['_id'];
-        $actualSortedIds = [
-            $firstInSearchResults,
-            $secondInSearchResults,
-            $thirdInSearchResults,
-            $fourthInSearchResults,
-            $fifthInSearchResults
-        ];
-        $this->assertCount(5, $result);
-        $this->assertEquals($correctSortedIds, $actualSortedIds);
+
+        self::assertCount(5, $result);
+        self::assertEqualsCanonicalizing(
+            [$productFirst->getId(), $productFourth->getId()],
+            [$firstInSearchResults, $secondInSearchResults]
+        );
+        self::assertEqualsCanonicalizing(
+            [$productSecond->getId(), $productFifth->getId()],
+            [$thirdInSearchResults, $fourthInSearchResults]
+        );
+        self::assertEquals($productThird->getId(), $fifthInSearchResults);
     }
 
     /**

dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Category/MultipleFiltersTest.php

@@ -48,7 +48,7 @@ public function testGetMultipleActiveFilters(
         );
         $this->navigationBlock->setLayout($this->layout);
         $resultProducts = $this->getProductSkus($this->navigationBlock->getLayer()->getProductCollection());
-        $this->assertEquals($expectedProducts, $resultProducts);
+        self::assertEqualsCanonicalizing($expectedProducts, $resultProducts);
     }
 
     /**

dev/tests/integration/testsuite/Magento/LayeredNavigation/Block/Navigation/Search/MultipleFiltersTest.php

@@ -45,7 +45,7 @@ public function testGetMultipleActiveFilters(
         );
         $this->navigationBlock->setLayout($this->layout);
         $resultProducts = $this->getProductSkus($this->navigationBlock->getLayer()->getProductCollection());
-        $this->assertEquals($expectedProducts, $resultProducts);
+        self::assertEqualsCanonicalizing($expectedProducts, $resultProducts);
     }
 
     /**

lib/web/jquery/spectrum/tinycolor.js

@@ -1,4 +1,4 @@
-// TinyColor v1.4.1
+// TinyColor v1.4.2
 // https://github.com/bgrins/TinyColor
 // Brian Grinstead, MIT License