From 83e3818ed41b04c3290139398f68d5fa043fff28 Mon Sep 17 00:00:00 2001 From: NamrataChangani Date: Wed, 4 Jul 2018 16:49:05 +0530 Subject: [PATCH 1/2] Fixed widget template rendering issue while rewriting widget block. --- .../CatalogWidget/Block/Product/Widget/Conditions.php | 2 +- app/code/Magento/CatalogWidget/etc/widget.xml | 2 +- app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php | 6 +++--- .../testsuite/Magento/Cms/Setup/ContentConverterTest.php | 4 ++-- .../Magento/Widget/Setup/LayoutUpdateConverterTest.php | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php index 04ae7c6a2d750..9f7962301cab4 100644 --- a/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php +++ b/app/code/Magento/CatalogWidget/Block/Product/Widget/Conditions.php @@ -51,7 +51,7 @@ class Conditions extends Template implements RendererInterface /** * @var string */ - protected $_template = 'product/widget/conditions.phtml'; + protected $_template = 'Magento_CatalogWidget::product/widget/conditions.phtml'; /** * @param \Magento\Framework\Data\Form\Element\Factory $elementFactory diff --git a/app/code/Magento/CatalogWidget/etc/widget.xml b/app/code/Magento/CatalogWidget/etc/widget.xml index 3d54c314c6622..67589dbe2e151 100644 --- a/app/code/Magento/CatalogWidget/etc/widget.xml +++ b/app/code/Magento/CatalogWidget/etc/widget.xml @@ -33,7 +33,7 @@ - diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php index b65ae1cc802d6..ae427b84c6095 100644 --- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php +++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php @@ -168,7 +168,7 @@ public function testGetWidgetDeclaration() 'show_pager' => '1', 'products_per_page' => '5', 'products_count' => '10', - 'template' => 'product/widget/content/grid.phtml', + 'template' => 'Magento_CatalogWidget::product/widget/content/grid.phtml', 'conditions' => $conditions ]; @@ -181,7 +181,7 @@ public function testGetWidgetDeclaration() ['1', false, '1'], ['5', false, '5'], ['10', false, '10'], - ['product/widget/content/grid.phtml', false, 'product/widget/content/grid.phtml'], + ['Magento_CatalogWidget::product/widget/content/grid.phtml', false, 'Magento_CatalogWidget::product/widget/content/grid.phtml'], ['encoded-conditions-string', false, 'encoded-conditions-string'], ]); @@ -221,7 +221,7 @@ public function testGetWidgetDeclarationWithZeroValueParam() 'show_pager' => '1', 'products_per_page' => '5', 'products_count' => '0', - 'template' => 'product/widget/content/grid.phtml', + 'template' => 'Magento_CatalogWidget::product/widget/content/grid.phtml', 'conditions' => $conditions ]; diff --git a/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php b/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php index b3bbd64b83e7e..7dbc3d2cc1dbd 100644 --- a/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php +++ b/dev/tests/integration/testsuite/Magento/Cms/Setup/ContentConverterTest.php @@ -34,8 +34,8 @@ public function convertDataProvider()

Hot Sellers

Here is what`s trending on Luma right now

'; - $serializedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="product/widget/content/grid.phtml" conditions_encoded="a:2:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;a:8:[i:0;s:4:`WS12`;i:1;s:4:`WT09`;i:2;s:4:`MT07`;i:3;s:4:`MH07`;i:4;s:7:`24-MB02`;i:5;s:7:`24-WB04`;i:6;s:8:`241-MB08`;i:7;s:8:`240-LV05`;]]]"}}'; - $jsonEncodedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="product/widget/content/grid.phtml" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:[`WS12`,`WT09`,`MT07`,`MH07`,`24-MB02`,`24-WB04`,`241-MB08`,`240-LV05`]^]^]"}}'; + $serializedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="Magento_CatalogWidget::product/widget/content/grid.phtml" conditions_encoded="a:2:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;a:8:[i:0;s:4:`WS12`;i:1;s:4:`WT09`;i:2;s:4:`MT07`;i:3;s:4:`MH07`;i:4;s:7:`24-MB02`;i:5;s:7:`24-WB04`;i:6;s:8:`241-MB08`;i:7;s:8:`240-LV05`;]]]"}}'; + $jsonEncodedWidgetContent = '{{widget type="Magento\\CatalogWidget\\Block\\Product\\ProductsList" products_per_page="8" products_count="8" template="Magento_CatalogWidget::product/widget/content/grid.phtml" conditions_encoded="^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:[`WS12`,`WT09`,`MT07`,`MH07`,`24-MB02`,`24-WB04`,`241-MB08`,`240-LV05`]^]^]"}}'; // @codingStandardsIgnoreEnd return [ 'no widget' => [ diff --git a/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php b/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php index 083876d7eddb3..43c0bd202cc92 100644 --- a/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php +++ b/dev/tests/integration/testsuite/Magento/Widget/Setup/LayoutUpdateConverterTest.php @@ -32,7 +32,7 @@ public function testConvert($value, $expected) public function convertDataProvider() { // @codingStandardsIgnoreStart - $beginning = 'show_pager0products_count10'; + $beginning = 'show_pager0products_count10'; $serializedWidgetXml = 'conditions_encodeda:3:[i:1;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Combine`;s:10:`aggregator`;s:3:`all`;s:5:`value`;s:1:`1`;s:9:`new_child`;s:0:``;]s:4:`1--1`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:3:`sku`;s:8:`operator`;s:2:`()`;s:5:`value`;s:15:`simple, simple1`;]s:4:`1--2`;a:4:[s:4:`type`;s:50:`Magento|CatalogWidget|Model|Rule|Condition|Product`;s:9:`attribute`;s:5:`price`;s:8:`operator`;s:2:`<=`;s:5:`value`;s:2:`10`;]]'; $jsonEncodedWidgetXml = 'conditions_encoded^[`1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Combine`,`aggregator`:`all`,`value`:`1`,`new_child`:``^],`1--1`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`sku`,`operator`:`()`,`value`:`simple, simple1`^],`1--2`:^[`type`:`Magento||CatalogWidget||Model||Rule||Condition||Product`,`attribute`:`price`,`operator`:`<=`,`value`:`10`^]^]'; $ending = 'page_var_namepobqks'; From 7e173eeaa9a43e544501ec239147bf83d8b7741d Mon Sep 17 00:00:00 2001 From: Vishal Gelani Date: Wed, 4 Jul 2018 21:04:36 +0530 Subject: [PATCH 2/2] Update WidgetTest.php --- app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php index ae427b84c6095..9f06b954cad5d 100644 --- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php +++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php @@ -181,7 +181,10 @@ public function testGetWidgetDeclaration() ['1', false, '1'], ['5', false, '5'], ['10', false, '10'], - ['Magento_CatalogWidget::product/widget/content/grid.phtml', false, 'Magento_CatalogWidget::product/widget/content/grid.phtml'], + ['Magento_CatalogWidget::product/widget/content/grid.phtml', + false, + 'Magento_CatalogWidget::product/widget/content/grid.phtml' + ], ['encoded-conditions-string', false, 'encoded-conditions-string'], ]);