Merge remote-tracking branch 'gl/AC-7850' into 82-compatibility

sidolov · sidolov · commit 0a19a7c4ec7b · 2023-01-31T14:22:25.000-06:00
diff --git a/dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php b/dev/tests/api-functional/testsuite/Magento/Framework/Stdlib/CookieManagerTest.php
@@ -144,7 +144,7 @@ public function testDeleteCookie()
         if (isset($cookie['max-age'])) {
             $this->assertEquals(0, $cookie['max-age']);
         }
-        $this->assertEquals('Thu, 01-Jan-1970 00:00:01 GMT', $cookie['expires']);
+        $this->assertEquals('Thu, 01 Jan 1970 00:00:01 GMT', $cookie['expires']);
     }
 
     /**
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Catalog/ProductSearchTest.php
@@ -1746,6 +1746,7 @@ public function testFilteringForProductsFromMultipleCategories()
      */
     public function testFilterProductsBySingleCategoryId(string $fieldName, string $queryCategoryId)
     {
+        CacheCleaner::clean(['config']);
         if (is_numeric($queryCategoryId)) {
             $queryCategoryId = (int) $queryCategoryId;
         }

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function testDeleteCookie()`
`144`	`144`	`if (isset($cookie['max-age'])) {`
`145`	`145`	`$this->assertEquals(0, $cookie['max-age']);`
`146`	`146`	`}`
`147`		`- $this->assertEquals('Thu, 01-Jan-1970 00:00:01 GMT', $cookie['expires']);`
	`147`	`+ $this->assertEquals('Thu, 01 Jan 1970 00:00:01 GMT', $cookie['expires']);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1746,6 +1746,7 @@ public function testFilteringForProductsFromMultipleCategories()`
`1746`	`1746`	`*/`
`1747`	`1747`	`public function testFilterProductsBySingleCategoryId(string $fieldName, string $queryCategoryId)`
`1748`	`1748`	`{`
	`1749`	`+ CacheCleaner::clean(['config']);`
`1749`	`1750`	`if (is_numeric($queryCategoryId)) {`
`1750`	`1751`	`$queryCategoryId = (int) $queryCategoryId;`
`1751`	`1752`	`}`