Merge remote-tracking branch 'origin/MC-37901' into 2.4-develop-sidecar-pr7

Author: zakdma

dev/tests/integration/testsuite/Magento/Widget/Block/Adminhtml/Widget/InstanceTest.php

@@ -118,13 +118,23 @@ public function gridFiltersDataProvider(): array
                     'filter' => base64_encode('sort_order=1'),
                 ],
                 'expected_widgets' => [
-                    'recently compared products'
+                    'recently compared products',
+                ],
+            ],
+            'filter_by_title_and_luma_theme' => [
+                'filter' => [
+                    'filter' => base64_encode(
+                        'title=cms page widget title&theme_id=' . $this->loadThemeIdByCode('Magento/luma')
+                    ),
+                ],
+                'expected_widgets' => [
+                    'cms page widget title',
                 ],
             ],
-            'filter_by_multiple_filters' => [
+            'filter_by_title_and_blank_theme' => [
                 'filter' => [
                     'filter' => base64_encode(
-                        'type=Magento%5CCatalog%5CBlock%5CWidget%5CRecentlyCompared&sort_order=1'
+                        'title=recently compared products&theme_id=' . $this->loadThemeIdByCode('Magento/blank')
                     ),
                 ],
                 'expected_widgets' => [
@@ -270,7 +280,7 @@ private function assertWidgets($expectedWidgets, AbstractCollection $collection)
         $this->assertCount(count($expectedWidgets), $collection);
         foreach ($expectedWidgets as $widgetTitle) {
             $item = $collection->getItemByColumnValue('title', $widgetTitle);
-            $this->assertNotNull($item);
+            $this->assertNotNull($item, sprintf('Expected widget %s is not present in grid', $widgetTitle));
         }
     }