From deb05f1a7d4e8ed789848a86817619df3ec43628 Mon Sep 17 00:00:00 2001
From: NamrataChangani <namratavora301@gmail.com>
Date: Wed, 4 Jul 2018 16:49:05 +0530
Subject: [PATCH 1/2] Fixed widget template rendering issue while rewriting
 widget block

---
 app/code/Magento/CatalogWidget/etc/widget.xml          | 2 +-
 app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

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 @@
             <parameter name="template" xsi:type="select" required="true" visible="true">
                 <label translate="true">Template</label>
                 <options>
-                    <option name="default" value="product/widget/content/grid.phtml" selected="true">
+                    <option name="default" value="Magento_CatalogWidget::product/widget/content/grid.phtml" selected="true">
                         <label translate="true">Products Grid Template</label>
                     </option>
                 </options>
diff --git a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
index 0232533b9c1d2..20b72a4f8a369 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -174,7 +174,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
         ];
 
@@ -187,7 +187,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'],
             ]);
 
@@ -225,7 +225,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
         ];
 

From 784d16778c8a46493dded1f9d16d5f4bbdc8fdac Mon Sep 17 00:00:00 2001
From: Vishal Gelani <vishalgelani99@gmail.com>
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 20b72a4f8a369..34e2136fb9686 100644
--- a/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
+++ b/app/code/Magento/Widget/Test/Unit/Model/WidgetTest.php
@@ -187,7 +187,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'],
             ]);