MTA-3254: Extend delete customer group test

rsavchuk · rsavchuk · commit f16e2dce880d · 2016-05-31T18:39:42.000+03:00
diff --git a/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml b/dev/tests/functional/tests/app/Magento/Bundle/Test/Fixture/BundleProduct.xml
@@ -76,7 +76,7 @@
         <field name="tax_class_id" is_required="0" group="product-details" source="Magento\Catalog\Test\Fixture\Product\TaxClass" />
         <field name="thumbnail" is_required="0" />
         <field name="thumbnail_label" is_required="0" />
-        <field name="tier_price" is_required="0" group="advanced-pricing" repository="Magento\Catalog\Test\Repository\Product\TierPrice" />
+        <field name="tier_price" is_required="0" group="advanced-pricing" source="Magento\Catalog\Test\Fixture\Product\TierPrice" repository="Magento\Catalog\Test\Repository\Product\TierPrice" />
         <field name="updated_at" is_required="1" />
         <field name="url_key" is_required="0" group="search-engine-optimization" />
         <field name="url_path" is_required="0" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/CatalogProductVirtual.xml
@@ -66,7 +66,7 @@
         <field name="tax_class_id" is_required="0" group="product-details" source="Magento\Catalog\Test\Fixture\Product\TaxClass" />
         <field name="thumbnail" is_required="0" />
         <field name="thumbnail_label" is_required="0" />
-        <field name="tier_price" is_required="0" group="advanced-pricing" repository="Magento\Catalog\Test\Repository\Product\TierPrice" />
+        <field name="tier_price" is_required="0" group="advanced-pricing" source="Magento\Catalog\Test\Fixture\Product\TierPrice" repository="Magento\Catalog\Test\Repository\Product\TierPrice" />
         <field name="stock_data" group="advanced-inventory" />
         <field name="updated_at" is_required="1" />
         <field name="url_key" is_required="0" group="search-engine-optimization" />
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TierPrice.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TierPrice.php
@@ -12,7 +12,10 @@
 use Magento\Mtf\Repository\RepositoryFactory;
 
 /**
+ * TierPrice data source.
  *
+ * Data keys:
+ *  - dataset
  */
 class TierPrice extends DataSource
 {
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductSimple/Curl.php
@@ -453,9 +453,8 @@ protected function preparePriceFields(array $fields)
         foreach ($fields as $priceKey => &$field) {
             foreach ($this->priceData as $key => $data) {
                 if ($data['name'] == 'cust_group') {
-                    $field[$data['name']] =
-                        $this->fixture->getDataFieldConfig('tier_price')['source']->
-                        getCustomerGroups()[$priceKey]->getCustomerGroupId();
+                    $field[$data['name']] = $this->fixture->getDataFieldConfig('tier_price')['source']
+                        ->getCustomerGroups()[$priceKey]->getCustomerGroupId();
                 } else {
                     $field[$data['name']] = $this->priceData[$key]['data'][$field[$key]];
                 }
diff --git a/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml b/dev/tests/functional/tests/app/Magento/Catalog/Test/Repository/CatalogProductSimple.xml
@@ -651,7 +651,7 @@
                 <item name="is_in_stock" xsi:type="string">In Stock</item>
             </field>
             <field name="tier_price" xsi:type="array">
-                <item name="dataset" xsi:type="string">general</item>
+                <item name="dataset" xsi:type="string">default</item>
             </field>
             <field name="category_ids" xsi:type="array">
                 <item name="dataset" xsi:type="string">default_subcategory</item>
diff --git a/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.xml b/dev/tests/functional/tests/app/Magento/ConfigurableProduct/Test/Fixture/ConfigurableProduct.xml
@@ -67,7 +67,7 @@
         <field name="tax_class_id" is_required="0" group="product-details" source="Magento\Catalog\Test\Fixture\Product\TaxClass" />
         <field name="thumbnail" is_required="0" />
         <field name="thumbnail_label" is_required="0" />
-        <field name="tier_price" is_required="0" group="advanced-pricing" repository="Magento\Catalog\Test\Repository\Product\TierPrice" />
+        <field name="tier_price" is_required="0" group="advanced-pricing" source="Magento\Catalog\Test\Fixture\Product\TierPrice" repository="Magento\Catalog\Test\Repository\Product\TierPrice" />
         <field name="updated_at" is_required="1" />
         <field name="url_key" is_required="0" group="search-engine-optimization" />
         <field name="url_path" is_required="0" />
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupChangedToDefaultOnCustomerForm.php
@@ -8,47 +8,44 @@
 
 use Magento\Customer\Test\Fixture\CustomerGroup;
 use Magento\Customer\Test\Fixture\Customer;
-use Magento\Customer\Test\Page\Adminhtml\CustomerIndex;
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertCustomerGroupChangedToDefaultOnCustomerForm.
+ * Assert that customer group is set to default on customer form.
  */
 class AssertCustomerGroupChangedToDefaultOnCustomerForm extends AbstractConstraint
 {
     /**
-     * Assert that customer group is General on account information page.
+     * Assert that customer group is set to default on customer form.
      *
      * @param Customer $customer
-     * @param CustomerGroup $customerGroup
+     * @param CustomerGroup $defaultCustomerGroup
      * @param CustomerIndexNew $customerIndexNew
-     * @param CustomerIndex $customerIndex
+     * @param CustomerIndexNew $customerIndexEdit
      * @return void
      */
     public function processAssert(
         Customer $customer,
-        CustomerGroup $customerGroup,
+        CustomerGroup $defaultCustomerGroup,
         CustomerIndexNew $customerIndexNew,
-        CustomerIndex $customerIndex
+        CustomerIndexNew $customerIndexEdit
     ) {
-        $filter = ['email' => $customer->getEmail()];
-        $customerIndex->open();
-        $customerIndex->getCustomerGridBlock()->searchAndOpen($filter);
+        $customerIndexEdit->open(['id' => $customer->getId()]);
         $customerFormData = $customerIndexNew->getCustomerForm()->getData();
         \PHPUnit_Framework_Assert::assertTrue(
-            $customerFormData['group_id'] == "General",
-            "Customer group {$customerGroup->getCustomerGroupCode()} not set to General after group was deleted."
+            $customerFormData['group_id'] == $defaultCustomerGroup->getCustomerGroupCode(),
+            "Customer group not set to default after group was deleted."
         );
     }
 
     /**
-     * Success assert of customer group set to default on account information page.
+     * Success assert of customer group set to default on customer form.
      *
      * @return string
      */
     public function toString()
     {
-        return 'Customer group is set to default on account information page.';
+        return 'Customer group is set to default on customer form.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCartPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCartPriceRuleForm.php
@@ -9,29 +9,25 @@
 use Magento\Customer\Test\Fixture\CustomerGroup;
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\SalesRule\Test\Block\Adminhtml\Promo\Quote\Edit\Section\RuleInformation;
-use Magento\SalesRule\Test\Page\Adminhtml\PromoQuoteIndex;
 use Magento\SalesRule\Test\Page\Adminhtml\PromoQuoteNew;
 
 /**
- * Class AssertCustomerGroupNotOnCartPriceRuleForm.
+ * Assert that customer group is not on cart price rule page.
  */
 class AssertCustomerGroupNotOnCartPriceRuleForm extends AbstractConstraint
 {
     /**
      * Assert that customer group is not on cart price rule page.
      *
-     * @param PromoQuoteIndex $promoQuoteIndex
      * @param PromoQuoteNew $promoQuoteNew
      * @param CustomerGroup $customerGroup
      * @return void
      */
     public function processAssert(
-        PromoQuoteIndex $promoQuoteIndex,
         PromoQuoteNew $promoQuoteNew,
         CustomerGroup $customerGroup
     ) {
-        $promoQuoteIndex->open();
-        $promoQuoteIndex->getGridPageActions()->addNew();
+        $promoQuoteNew->open();
         $promoQuoteNew->getSalesRuleForm()->openSection('rule_information');
 
         /** @var RuleInformation $ruleInformationTab */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCatalogPriceRuleForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnCatalogPriceRuleForm.php
@@ -6,32 +6,28 @@
 
 namespace Magento\Customer\Test\Constraint;
 
-use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleIndex;
 use Magento\CatalogRule\Test\Page\Adminhtml\CatalogRuleNew;
 use Magento\Customer\Test\Fixture\CustomerGroup;
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\CatalogRule\Test\Block\Adminhtml\Promo\Catalog\Edit\Section\RuleInformation;
 
 /**
- * Class AssertCustomerGroupNotOnCatalogPriceRuleForm.
+ * Assert that customer group is not on catalog price rule page.
  */
 class AssertCustomerGroupNotOnCatalogPriceRuleForm extends AbstractConstraint
 {
     /**
      * Assert that customer group is not on catalog price rule page.
      *
-     * @param CatalogRuleIndex $catalogRuleIndex
      * @param CatalogRuleNew $catalogRuleNew
      * @param CustomerGroup $customerGroup
      * @return void
      */
     public function processAssert(
-        CatalogRuleIndex $catalogRuleIndex,
         CatalogRuleNew $catalogRuleNew,
         CustomerGroup $customerGroup
     ) {
-        $catalogRuleIndex->open();
-        $catalogRuleIndex->getGridPageActions()->addNew();
+        $catalogRuleNew->open();
         $catalogRuleNew->getEditForm()->openSection('rule_information');
 
         /** @var RuleInformation $ruleInformationSection */
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnProductForm.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupNotOnProductForm.php
@@ -13,7 +13,7 @@
 use Magento\Mtf\Constraint\AbstractConstraint;
 
 /**
- * Class AssertCustomerGroupNotOnProductForm.
+ * Assert that customer group is not on product form.
  */
 class AssertCustomerGroupNotOnProductForm extends AbstractConstraint
 {
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForDefaultCustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForDefaultCustomerGroup.php
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForSystemCustomerGroup.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertNoDeleteForSystemCustomerGroup.php
@@ -7,32 +7,22 @@
 namespace Magento\Customer\Test\Constraint;
 
 use Magento\Customer\Test\Fixture\CustomerGroup;
-use Magento\Customer\Test\Page\Adminhtml\CustomerGroupIndex;
 use Magento\Mtf\Constraint\AbstractConstraint;
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupEdit;
 
 /**
- * Class AssertNoDeleteForSystemCustomerGroup.
+ * Assert that system customer group cannot be deleted.
  */
 class AssertNoDeleteForSystemCustomerGroup extends AbstractConstraint
 {
     /**
-     * Assert that system customer group NOT LOGGED IN is not possible to delete.
+     * Assert that delete button is not available for system customer group.
      *
-     * @param CustomerGroupIndex $customerGroupIndex
      * @param CustomerGroupEdit $customerGroupEdit
      * @return void
      */
-    public function processAssert(
-        CustomerGroupIndex $customerGroupIndex,
-        CustomerGroupEdit $customerGroupEdit
-    ) {
-        $filter = [
-            'code' => 'NOT LOGGED IN',
-        ];
-
-        $customerGroupIndex->open();
-        $customerGroupIndex->getCustomerGroupGrid()->searchAndOpen($filter);
+    public function processAssert(CustomerGroupEdit $customerGroupEdit)
+    {
         \PHPUnit_Framework_Assert::assertFalse(
             $customerGroupEdit->getPageMainActions()->checkDeleteButton(),
             "Delete button is visible."
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.php
@@ -11,12 +11,8 @@
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupNew;
 use Magento\Mtf\TestCase\Injectable;
 use Magento\Customer\Test\Fixture\Customer;
-use Magento\Mtf\Fixture\FixtureFactory;
 
 /**
- * Test Creation for DeleteCustomerGroupEntity.
- *
- * Test Flow:
  * Preconditions:
  *  1. Customer Group is created.
  *  2. Customer is created and assigned to this group.
@@ -70,26 +66,19 @@ public function __inject(
     /**
      * Delete Customer Group.
      *
-     * @param FixtureFactory $fixtureFactory
      * @param CustomerGroup $customerGroup
+     * @param Customer $customer [optional]
      * @return array
      */
-    public function test(
-        FixtureFactory $fixtureFactory,
-        CustomerGroup $customerGroup
-    ) {
+    public function test(CustomerGroup $customerGroup, Customer $customer = null)
+    {
         // Precondition
-        $customerGroup->persist();
-
-        /** @var Customer $customer */
-        $customer = $fixtureFactory->createByCode(
-            'customer',
-            [
-                'dataset' => 'default',
-                'data' => ['group_id' => ['customerGroup' => $customerGroup]]
-            ]
-        );
-        $customer->persist();
+        if ($customer !== null) {
+            $customer->persist();
+            $customerGroup = $customer->getDataFieldConfig('group_id')['source']->getCustomerGroup();
+        } else {
+            $customerGroup->persist();
+        }
 
         // Steps
         $filter = ['code' => $customerGroup->getCustomerGroupCode()];
@@ -98,6 +87,9 @@ public function test(
         $this->customerGroupNew->getPageMainActions()->delete();
         $this->customerGroupNew->getModalBlock()->acceptAlert();
 
-        return ['customer' => $customer];
+        return [
+            'customer' => $customer,
+            'customerGroup' => $customerGroup
+        ];
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteCustomerGroupEntityTest.xml
@@ -8,14 +8,15 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
     <testCase name="Magento\Customer\Test\TestCase\DeleteCustomerGroupEntityTest" summary="Delete Customer Group" ticketId="MAGETWO-25243">
         <variation name="DeleteCustomerGroupEntityTestVariation1">
+            <data name="customer/dataset" xsi:type="string">customer_with_new_customer_group</data>
+            <data name="customer/data/group_id/dataset" xsi:type="string">default</data>
+            <data name="defaultCustomerGroup/dataset" xsi:type="string">General</data>
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupSuccessDeleteMessage" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupNotInGrid" />
-            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupChangedToDefaultOnCustomerForm" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupNotOnProductForm" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupNotOnCartPriceRuleForm" />
             <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupNotOnCatalogPriceRuleForm" />
-            <constraint name="Magento\Customer\Test\Constraint\AssertNoDeleteForDefaultCustomerGroup" />
-            <constraint name="Magento\Customer\Test\Constraint\AssertNoDeleteForSystemCustomerGroup" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupChangedToDefaultOnCustomerForm" />
         </variation>
     </testCase>
 </config>
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.php
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/DeleteSystemCustomerGroupTest.xml
diff --git a/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.xml b/dev/tests/functional/tests/app/Magento/Downloadable/Test/Fixture/DownloadableProduct.xml

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,10 @@`
`12`	`12`	`use Magento\Mtf\Repository\RepositoryFactory;`
`13`	`13`
`14`	`14`	`/**`
	`15`	`+ * TierPrice data source.`
`15`	`16`	`*`
	`17`	`+ * Data keys:`
	`18`	`+ * - dataset`
`16`	`19`	`*/`
`17`	`20`	`class TierPrice extends DataSource`
`18`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`use Magento\Mtf\Constraint\AbstractConstraint;`
`14`	`14`
`15`	`15`	`/**`
`16`		`- * Class AssertCustomerGroupNotOnProductForm.`
	`16`	`+ * Assert that customer group is not on product form.`
`17`	`17`	`*/`
`18`	`18`	`class AssertCustomerGroupNotOnProductForm extends AbstractConstraint`
`19`	`19`	`{`