MAGETWO-62405: Catalog cart price rule functional test fix

Author: pdohogne-magento

dev/tests/functional/tests/app/Magento/SalesRule/Test/Block/Adminhtml/Promo/Quote/Edit/PromoQuoteForm.xml

@@ -70,7 +70,7 @@
                 <input>select</input>
             </simple_free_shipping>
             <actions_serialized>
-                <selector>#rule_actions_fieldset</selector>
+                <selector>.fieldset[id^="sales_rule_formrule_actions_fieldset_"]</selector>
                 <input>conditions</input>
             </actions_serialized>
         </fields>

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.php

@@ -54,6 +54,13 @@ class UpdateSalesRuleEntityTest extends Injectable
      */
     protected $salesRuleName;
 
+    /**
+     * Replace array to fill in category id
+     *
+     * @var array
+     */
+    protected $replace;
+
     /**
      * Create simple product with category.
      *
@@ -67,6 +74,13 @@ public function __prepare(FixtureFactory $fixtureFactory)
             ['dataset' => 'simple_for_salesrule_1']
         );
         $productForSalesRule1->persist();
+        $this->replace = [
+            'actions' => [
+                'actions_serialized' => [
+                    '%category_id%' => $productForSalesRule1->getDataFieldConfig('category_ids')['source']->getIds()[0]
+                ]
+            ],
+        ];
         return [
             'productForSalesRule1' => $productForSalesRule1,
         ];
@@ -108,7 +122,7 @@ public function testUpdateSalesRule(
         // Steps
         $this->promoQuoteIndex->open();
         $this->promoQuoteIndex->getPromoQuoteGrid()->searchAndOpen($filter);
-        $this->promoQuoteEdit->getSalesRuleForm()->fill($salesRule);
+        $this->promoQuoteEdit->getSalesRuleForm()->fill($salesRule, null, $this->replace);
         $this->promoQuoteEdit->getFormPageActions()->save();
     }
 

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/UpdateSalesRuleEntityTest.xml

@@ -10,6 +10,7 @@
         <variation name="UpdateSalesRuleEntityTestVariation1">
             <data name="salesRuleOrigin/dataset" xsi:type="string">active_sales_rule_with_complex_conditions</data>
             <data name="salesRule/data/conditions_serialized" xsi:type="string">[Subtotal|is|400]</data>
+            <data name="salesRule/data/actions_serialized" xsi:type="string">[Category|is|%category_id%]</data>
             <data name="salesRule/data/simple_action" xsi:type="string">Buy X get Y free (discount amount is Y)</data>
             <data name="salesRule/data/discount_amount" xsi:type="string">1</data>
             <data name="salesRule/data/discount_step" xsi:type="string">3</data>

dev/tests/integration/framework/Magento/TestFramework/Annotation/AppIsolation.php

@@ -40,6 +40,9 @@ protected function _isolateApp()
     {
         if ($this->_hasNonIsolatedTests) {
             $this->_application->reinitialize();
+            $_SESSION = [];
+            $_COOKIE = [];
+            session_write_close();
             $this->_hasNonIsolatedTests = false;
         }
     }