Merge remote-tracking branch 'arcticfoxes/MC-14990' into 2.3.1-qwerty-pr

Author: Joan He

app/code/Magento/Catalog/Model/Product/ProductFrontendAction/Synchronizer.php

@@ -143,7 +143,7 @@ private function getProductIdsByActions(array $actions)
         $productIds = [];
 
         foreach ($actions as $action) {
-            if (isset($action['product_id']) && is_int($action['product_id'])) {
+            if (isset($action['product_id'])) {
                 $productIds[] = $action['product_id'];
             }
         }

app/code/Magento/Catalog/Test/Unit/Model/Product/ProductFrontendAction/SynchronizerTest.php

@@ -80,14 +80,15 @@ protected function setUp()
 
     public function testFilterProductActions()
     {
+        $typeId = 'recently_compared_product';
         $productsData = [
             1 => [
                 'added_at' => 12,
                 'product_id' => 1,
             ],
             2 => [
                 'added_at' => 13,
-                'product_id' => 2,
+                'product_id' => '2',
             ],
             3 => [
                 'added_at' => 14,
@@ -126,10 +127,12 @@ public function testFilterProductActions()
         $collection->expects($this->once())
             ->method('addFilterByUserIdentities')
             ->with(1, 34);
-        $collection->expects($this->any())
+        $collection->expects($this->at(1))
             ->method('addFieldToFilter')
-            ->withConsecutive(['type_id'], ['product_id']);
-
+            ->with('type_id', $typeId);
+        $collection->expects($this->at(2))
+            ->method('addFieldToFilter')
+            ->with('product_id', [1, 2]);
         $iterator = new \IteratorIterator(new \ArrayIterator([$frontendAction]));
         $collection->expects($this->once())
             ->method('getIterator')