MAGETWO-59308: Design theme dropdown does not display all themes in Widgets

- fix-rewrite test after CR

Author: sdzhepa

dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/WidgetGrid.php

@@ -7,12 +7,20 @@
 namespace Magento\Widget\Test\Block\Adminhtml\Widget;
 
 use Magento\Backend\Test\Block\Widget\Grid as AbstractGrid;
+use Magento\Mtf\Client\Locator;
 
 /**
  * Widget grid on the Widget Instance Index page.
  */
 class WidgetGrid extends AbstractGrid
 {
+    /**
+     * Selector for not empty options at select element.
+     *
+     * @var string
+     */
+    private $notEmptyOptionsSelector = 'option:not([value=""])';
+
     /**
      * Locator value for link in action column.
      *
@@ -41,4 +49,23 @@ class WidgetGrid extends AbstractGrid
             'input' => 'select',
         ],
     ];
+
+    /**
+     * Returns values of theme_id filter.
+     *
+     * @return array
+     */
+    public function getThemeIdValues()
+    {
+        $values = [];
+        $themeFilter = $this->filters['theme_id'];
+        $strategy = empty($themeFilter['strategy']) ? Locator::SELECTOR_CSS : $themeFilter['strategy'];
+        $element = $this->_rootElement->find($themeFilter['selector'], $strategy, $themeFilter['input']);
+        $options = $element->getElements($this->notEmptyOptionsSelector);
+        foreach ($options as $option) {
+            $values[] = $option->getText();
+        }
+
+        return $values;
+    }
 }

dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertThemeFilterValuesOnWidgetGrid.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Widget\Test\Fixture\Widget;
+use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
+
+/**
+ * Assert theme filter contains all possible values from created widgets.
+ */
+class AssertThemeFilterValuesOnWidgetGrid extends AbstractConstraint
+{
+    /**
+     * Assert theme filter contains all possible values from created widgets.
+     *
+     * @param Widget[] $widgets
+     * @param WidgetInstanceIndex $widgetInstanceIndex
+     * @return void
+     */
+    public function processAssert(array $widgets, WidgetInstanceIndex $widgetInstanceIndex)
+    {
+        $expectedValues = [];
+        foreach ($widgets as $widget) {
+            $expectedValues[] = $widget->getThemeId();
+        }
+        $widgetInstanceIndex->open();
+        $actualValues = $widgetInstanceIndex->getWidgetGrid()->getThemeIdValues();
+        \PHPUnit_Framework_Assert::assertEmpty(
+            array_diff($expectedValues, $actualValues),
+            'Widget grid theme filter doesn\'t contain all possible values from created widgets.'
+        );
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Widget grid theme filter contains all possible values from created widgets.';
+    }
+}

dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetInGrid.php

@@ -11,7 +11,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertWidgetInGrid
+ * Assert widget is present in widget grid.
  */
 class AssertWidgetInGrid extends AbstractConstraint
 {
@@ -20,15 +20,18 @@ class AssertWidgetInGrid extends AbstractConstraint
     /* end tags */
 
     /**
-     * Assert widget availability in widget grid
+     * Assert widget availability in widget grid.
+     * Verifying such fields as:
+     * - title
+     * - theme_id
      *
      * @param Widget $widget
      * @param WidgetInstanceIndex $widgetInstanceIndex
      * @return void
      */
     public function processAssert(Widget $widget, WidgetInstanceIndex $widgetInstanceIndex)
     {
-        $filter = ['title' => $widget->getTitle()];
+        $filter = ['title' => $widget->getTitle(), 'theme_id' => $widget->getThemeId()];
         $widgetInstanceIndex->open();
         \PHPUnit_Framework_Assert::assertTrue(
             $widgetInstanceIndex->getWidgetGrid()->isRowVisible($filter),
@@ -37,7 +40,7 @@ public function processAssert(Widget $widget, WidgetInstanceIndex $widgetInstanc
     }
 
     /**
-     * Returns a string representation of the object
+     * Returns a string representation of the object.
      *
      * @return string
      */

dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetWithDifferentThemesArePresentedInGrid.php

@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright © 2016 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Widget\Test\Constraint;
+
+use Magento\Mtf\Constraint\AbstractConstraint;
+use Magento\Widget\Test\Fixture\Widget;
+use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
+
+/**
+ * Assert widgets are present in widget grid.
+ */
+class AssertWidgetsInGrid extends AbstractConstraint
+{
+    /**
+     * Assert widgets are present in widget grid.
+     * Verifying such fields as:
+     * - title
+     * - theme_id
+     *
+     * @param Widget[] $widgets
+     * @param WidgetInstanceIndex $widgetInstanceIndex
+     * @param AssertWidgetInGrid $assertWidgetInGrid
+     * @return void
+     */
+    public function processAssert(
+        array $widgets,
+        WidgetInstanceIndex $widgetInstanceIndex,
+        AssertWidgetInGrid $assertWidgetInGrid
+    ) {
+        foreach ($widgets as $widget) {
+            $assertWidgetInGrid->processAssert($widget, $widgetInstanceIndex);
+        }
+    }
+
+    /**
+     * Returns a string representation of the object.
+     *
+     * @return string
+     */
+    public function toString()
+    {
+        return 'Widgets are present in widget grid.';
+    }
+}

dev/tests/functional/tests/app/Magento/Widget/Test/Constraint/AssertWidgetsInGrid.php

@@ -27,6 +27,7 @@ class Curl extends AbstractCurl
     protected $mappingData = [
         'code' => [
             'CMS Page Link' => 'cms_page_link',
+            'Recently Viewed Products' => 'recently_viewed',
         ],
         'block' => [
             'Main Content Area' => 'content',

dev/tests/functional/tests/app/Magento/Widget/Test/Handler/Widget/Curl.php

@@ -25,7 +25,8 @@
                 <item name="dataset" xsi:type="string">cmsPageLink</item>
             </field>
         </dataset>
-        <dataset name="simple_widget">
+
+        <dataset name="recently_viewed_products_on_blank_theme">
             <field name="code" xsi:type="string">Recently Viewed Products</field>
             <field name="title" xsi:type="string">Title_%isolation%</field>
             <field name="theme_id" xsi:type="string">Magento Blank</field>

dev/tests/functional/tests/app/Magento/Widget/Test/Repository/Widget.xml

@@ -6,7 +6,6 @@
 
 namespace Magento\Widget\Test\TestCase;
 
-use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceEdit;
 use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
 use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceNew;
@@ -54,11 +53,6 @@ abstract class AbstractCreateWidgetEntityTest extends Injectable
      */
     protected $cache;
 
-    /**
-     * @var FixtureFactory
-     */
-    protected $fixtureFactory;
-
     /**
      * Injection data.
      *
@@ -67,22 +61,20 @@ abstract class AbstractCreateWidgetEntityTest extends Injectable
      * @param WidgetInstanceEdit $widgetInstanceEdit
      * @param CmsIndex $cmsIndex
      * @param Cache $cache
-     * @param FixtureFactory $fixtureFactory
+     * @return void
      */
     public function __inject(
         WidgetInstanceIndex $widgetInstanceIndex,
         WidgetInstanceNew $widgetInstanceNew,
         WidgetInstanceEdit $widgetInstanceEdit,
         CmsIndex $cmsIndex,
-        Cache $cache,
-        FixtureFactory $fixtureFactory
+        Cache $cache
     ) {
         $this->widgetInstanceIndex = $widgetInstanceIndex;
         $this->widgetInstanceNew = $widgetInstanceNew;
         $this->widgetInstanceEdit = $widgetInstanceEdit;
         $this->cmsIndex = $cmsIndex;
         $this->cache = $cache;
-        $this->fixtureFactory = $fixtureFactory;
     }
 
     /**

dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/AbstractCreateWidgetEntityTest.php

@@ -25,7 +25,8 @@ class CreateWidgetEntityTest extends AbstractCreateWidgetEntityTest
 {
     /* tags */
     const MVP = 'yes';
-    const SEVERITY = 'S3';
+    const TEST_TYPE = 'extended_acceptance_test';
+    const SEVERITY = 'S1';
     /* end tags */
 
     /**
@@ -39,11 +40,10 @@ class CreateWidgetEntityTest extends AbstractCreateWidgetEntityTest
      * Create for New Widget.
      *
      * @param Widget $widget
-     * @param array $additionalWidgets
      * @param array $caches [optional]
-     * @return array
+     * @return void
      */
-    public function test(Widget $widget, array $additionalWidgets = [], array $caches = [])
+    public function test(Widget $widget, array $caches = [])
     {
         // Preconditions
         $this->caches = $caches;
@@ -54,14 +54,6 @@ public function test(Widget $widget, array $additionalWidgets = [], array $cache
         $this->widgetInstanceIndex->getPageActionsBlock()->addNew();
         $this->widgetInstanceNew->getWidgetForm()->fill($widget);
         $this->widgetInstanceEdit->getPageActionsBlock()->save();
-
-        foreach ($additionalWidgets as $key => $additionalWidget) {
-            $additionalWidget = $this->fixtureFactory->createByCode('widget', ['dataset' => $additionalWidget]);
-            $additionalWidget->persist();
-            $additionalWidgets[$key] = $additionalWidget;
-        }
-
-        return ['additionalWidgets' => $additionalWidgets];
     }
 
     /**

dev/tests/functional/tests/app/Magento/Widget/Test/TestCase/CreateWidgetEntityTest.php

@@ -118,16 +118,5 @@
             <constraint name="Magento\Widget\Test\Constraint\AssertWidgetSuccessSaveMessage" />
             <constraint name="Magento\Widget\Test\Constraint\AssertWidgetCatalogNewProductsList" />
         </variation>
-        <variation name="CreateWidgetEntityTestWithDifferentThemes">
-            <data name="tag" xsi:type="string">severity:S3</data>
-            <data name="widget/data/code" xsi:type="string">Recently Viewed Products</data>
-            <data name="widget/data/theme_id" xsi:type="string">Magento Blank</data>
-            <data name="widget/data/title" xsi:type="string">Title_%isolation%</data>
-            <data name="widget/data/store_ids/dataset" xsi:type="string">all_store_views</data>
-            <data name="widget/data/widget_instance/dataset" xsi:type="string">for_viewed_products</data>
-            <data name="widget/data/parameters/dataset" xsi:type="string">recentlyViewedProducts</data>
-            <data name="additionalWidgets/0" xsi:type="string">simple_widget</data>
-            <constraint name="Magento\Widget\Test\Constraint\AssertWidgetWithDifferentThemesArePresentedInGrid" />
-        </variation>
     </testCase>
 </config>