Merge pull request #2454 from magento-qwerty/MAGETWO-71381-2

Fixed issues:
- MAGETWO-71381: Widget tied with cart price rule displays even when rule was not applied

Author: dvoskoboinikov

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Cart/DiscountCodes.php

@@ -37,14 +37,21 @@ class DiscountCodes extends Form
     protected $couponCode = '#coupon_code';
 
     /**
-     * Click apply button selector
+     * Locator for "Apply Discount" button.
      *
      * @var string
      */
     protected $applyButton = '.action.apply';
 
     /**
-     * Enter discount code and click apply button
+     * Locator for "Cancel Coupon" button.
+     *
+     * @var string
+     */
+    protected $cancelButton = '.action.cancel';
+
+    /**
+     * Enter Discount Code and click "Apply Discount" button.
      *
      * @param string $code
      * @return void
@@ -57,4 +64,17 @@ public function applyCouponCode($code)
         $this->_rootElement->find($this->couponCode, Locator::SELECTOR_CSS)->setValue($code);
         $this->_rootElement->find($this->applyButton, Locator::SELECTOR_CSS)->click();
     }
+
+    /**
+     * Click "Cancel Coupon" button.
+     *
+     * @return void
+     */
+    public function cancelCouponCode()
+    {
+        if (!$this->_rootElement->find($this->formWrapper)->isVisible()) {
+            $this->_rootElement->find($this->openForm)->click();
+        }
+        $this->_rootElement->find($this->cancelButton)->click();
+    }
 }

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/ApplySalesRuleOnFrontendStep.php

@@ -29,15 +29,24 @@ class ApplySalesRuleOnFrontendStep implements TestStepInterface
      */
     protected $salesRule;
 
+    /**
+     * Sales Rule Discount Code.
+     *
+     * @var SalesRule
+     */
+    protected $couponCode;
+
     /**
      * @constructor
      * @param CheckoutCart $checkoutCart
      * @param SalesRule $salesRule
+     * @param string $couponCode
      */
-    public function __construct(CheckoutCart $checkoutCart, SalesRule $salesRule = null)
+    public function __construct(CheckoutCart $checkoutCart, SalesRule $salesRule = null, $couponCode = null)
     {
         $this->checkoutCart = $checkoutCart;
         $this->salesRule = $salesRule;
+        $this->couponCode = $couponCode;
     }
 
     /**
@@ -51,5 +60,10 @@ public function run()
             $this->checkoutCart->getDiscountCodesBlock()->applyCouponCode($this->salesRule->getCouponCode());
             $this->checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
         }
+
+        if ($this->couponCode !== null) {
+            $this->checkoutCart->getDiscountCodesBlock()->applyCouponCode($this->couponCode);
+            $this->checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
+        }
     }
 }

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestStep/CancelSalesRuleOnFrontendStep.php

@@ -0,0 +1,43 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\SalesRule\Test\TestStep;
+
+use Magento\Checkout\Test\Page\CheckoutCart;
+use Magento\Mtf\TestStep\TestStepInterface;
+
+/**
+ * Cancel Sales Rule before one page checkout.
+ */
+class CancelSalesRuleOnFrontendStep implements TestStepInterface
+{
+    /**
+     * Checkout cart page.
+     *
+     * @var CheckoutCart
+     */
+    protected $checkoutCart;
+
+    /**
+     * @constructor
+     * @param CheckoutCart $checkoutCart
+     */
+    public function __construct(CheckoutCart $checkoutCart)
+    {
+        $this->checkoutCart = $checkoutCart;
+    }
+
+    /**
+     * Apply coupon before one page checkout.
+     *
+     * @return void
+     */
+    public function run()
+    {
+        $this->checkoutCart->getDiscountCodesBlock()->cancelCouponCode();
+        $this->checkoutCart->getTotalsBlock()->waitForUpdatedTotals();
+    }
+}

dev/tests/functional/tests/app/Magento/Widget/Test/Block/Adminhtml/Widget/Instance/Edit/Tab/WidgetInstanceType/GenericPages.xml

@@ -11,6 +11,10 @@
             <selector>.page_group_select</selector>
             <input>optgroupselect</input>
         </page_group>
+        <layout_handle>
+            <selector>#layout_handle</selector>
+            <input>select</input>
+        </layout_handle>
         <block>
             <selector>.block_reference select</selector>
             <input>select</input>

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

@@ -6,17 +6,26 @@
 
 namespace Magento\Widget\Test\TestCase;
 
+use Magento\Mtf\TestStep\TestStepFactory;
 use Magento\Widget\Test\Fixture\Widget;
 use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceEdit;
 use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceIndex;
 use Magento\Widget\Test\Page\Adminhtml\WidgetInstanceNew;
 use Magento\Mtf\TestCase\Injectable;
+use Magento\PageCache\Test\Page\Adminhtml\AdminCache;
 
 /**
  * Test Creation for New Instance of WidgetEntity.
  */
 abstract class AbstractCreateWidgetEntityTest extends Injectable
 {
+    /**
+     * Factory for Test Steps.
+     *
+     * @var TestStepFactory
+     */
+    protected $testStep;
+
     /**
      * WidgetInstanceIndex page.
      *
@@ -38,31 +47,57 @@ abstract class AbstractCreateWidgetEntityTest extends Injectable
      */
     protected $widgetInstanceEdit;
 
+    /**
+     * "Cache Management" Admin panel page.
+     *
+     * @var AdminCache
+     */
+    protected $cachePage;
+
     /**
      * Injection data.
      *
      * @param WidgetInstanceIndex $widgetInstanceIndex
      * @param WidgetInstanceNew $widgetInstanceNew
      * @param WidgetInstanceEdit $widgetInstanceEdit
+     * @param AdminCache $adminCache
+     * @param TestStepFactory $testStepFactory
      * @return void
      */
     public function __inject(
         WidgetInstanceIndex $widgetInstanceIndex,
         WidgetInstanceNew $widgetInstanceNew,
-        WidgetInstanceEdit $widgetInstanceEdit
+        WidgetInstanceEdit $widgetInstanceEdit,
+        AdminCache $adminCache,
+        TestStepFactory $testStepFactory
     ) {
         $this->widgetInstanceIndex = $widgetInstanceIndex;
         $this->widgetInstanceNew = $widgetInstanceNew;
         $this->widgetInstanceEdit = $widgetInstanceEdit;
+        $this->cachePage = $adminCache;
+        $this->testStep = $testStepFactory;
     }
 
     /**
-     * Delete all widgets.
+     * Delete all Widgets & flush the Cache.
      *
      * @return void
      */
     public function tearDown()
     {
         $this->objectManager->create('Magento\Widget\Test\TestStep\DeleteAllWidgetsStep')->run();
+        $this->flushCache();
+    }
+
+    /**
+     * Flush Magento Cache in Admin panel.
+     *
+     * @return void
+     */
+    protected function flushCache()
+    {
+        $this->cachePage->open();
+        $this->cachePage->getActionsBlock()->flushMagentoCache();
+        $this->cachePage->getMessagesBlock()->waitSuccessMessage();
     }
 }