MAGETWO-49091: Unskip CatalogRule FAT tests and fix if needed

katmoon · katmoon · commit e8176917f03a · 2016-02-11T17:53:19.000+02:00
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/FormPageActions.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/Block/Adminhtml/FormPageActions.php
@@ -19,7 +19,7 @@ class FormPageActions extends PageActions
      *
      * @var string
      */
-    protected $saveAndApplyButton = '#save_apply';
+    protected $saveAndApplyButton = '#save_and_apply';
 
     /**
      * Click on "Save and Apply" button
diff --git a/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.php b/dev/tests/functional/tests/app/Magento/CatalogRule/Test/TestCase/CreateCatalogRuleTest.php
@@ -44,7 +44,6 @@ class CreateCatalogRuleTest extends AbstractCatalogRuleEntityTest
      */
     public function testCreate(CatalogRule $catalogPriceRule, $product, $conditionEntity, Customer $customer = null)
     {
-        $this->markTestIncomplete('MAGETWO-48731');
         /** @var CatalogProductSimple $productSimple */
         $productSimple = $this->fixtureFactory->createByCode('catalogProductSimple', ['dataset' => $product]);
         // Prepare data

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ class FormPageActions extends PageActions`
`19`	`19`	`*`
`20`	`20`	`* @var string`
`21`	`21`	`*/`
`22`		`- protected $saveAndApplyButton = '#save_apply';`
	`22`	`+ protected $saveAndApplyButton = '#save_and_apply';`
`23`	`23`
`24`	`24`	`/**`
`25`	`25`	`* Click on "Save and Apply" button`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@ class CreateCatalogRuleTest extends AbstractCatalogRuleEntityTest`
`44`	`44`	`*/`
`45`	`45`	`public function testCreate(CatalogRule $catalogPriceRule, $product, $conditionEntity, Customer $customer = null)`
`46`	`46`	`{`
`47`		`- $this->markTestIncomplete('MAGETWO-48731');`
`48`	`47`	`/** @var CatalogProductSimple $productSimple */`
`49`	`48`	`$productSimple = $this->fixtureFactory->createByCode('catalogProductSimple', ['dataset' => $product]);`
`50`	`49`	`// Prepare data`