MTA-576: Re-factor Test for Create Customer on Backend

orykh · orykh · commit 09a2ea45f4f7 · 2015-02-02T15:44:38.000+02:00
- Fixed bug with customer
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendFormTitle.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerBackendFormTitle.php
@@ -13,7 +13,7 @@
 /**
  * Assert that edit page of customer account contains correct title.
  */
-class AssertCustomerTitle extends AbstractConstraint
+class AssertCustomerBackendFormTitle extends AbstractConstraint
 {
     /* tags */
     const SEVERITY = 'middle';
@@ -42,6 +42,6 @@ public function processAssert(CustomerAccountIndex $pageCustomerIndex, Customer
      */
     public function toString()
     {
-        return 'Assert that title is correct.';
+        return 'Customer backend edit form title is correct.';
     }
 }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/AddressBook.php
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/Address.php b/dev/tests/functional/tests/app/Magento/Customer/Test/Fixture/Customer/Address.php
@@ -6,7 +6,7 @@
 
 namespace Magento\Customer\Test\Fixture\Customer;
 
-use Magento\Customer\Test\Fixture\Address as AddressInjectable;
+use Magento\Customer\Test\Fixture\Address as AddressFixture;
 use Magento\Mtf\Fixture\FixtureFactory;
 use Magento\Mtf\Fixture\FixtureInterface;
 
@@ -51,14 +51,14 @@ public function __construct(FixtureFactory $fixtureFactory, array $params, array
         if (isset($data['presets'])) {
             $data['presets'] = explode(',', $data['presets']);
             foreach ($data['presets'] as $value) {
-                /** @var AddressInjectable $addresses*/
+                /** @var AddressFixture $addresses*/
                 $addresses = $fixtureFactory->createByCode('address', ['dataSet' => $value]);
                 $this->data[] = $addresses->getData();
                 $this->addressesFixture[] = $addresses;
             }
         } elseif (empty($data['presets']) && !empty($data['addresses'])) {
             foreach ($data['addresses'] as $addresses) {
-                /** @var AddressInjectable $addresses */
+                /** @var AddressFixture $addresses */
                 $this->data[] = $addresses->getData();
                 $this->addressesFixture[] = $addresses;
             }
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest.php
@@ -13,9 +13,7 @@
 use Magento\Customer\Test\Page\Adminhtml\CustomerIndexNew;
 
 /**
- * Test Coverage for CreateCustomerBackendEntityTest.
- *
- * General Flow:
+ * Steps:
  * 1. Log in as default admin user.
  * 2. Go to Customers > All Customers.
  * 3. Press "Add New Customer" button.
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/test.csv b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendEntityTest/test.csv
@@ -1,7 +1,7 @@
-"customerAction";"customer/data/website_id";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/firstname";"address/data/lastname";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/postcode";"address/data/telephone";"constraint";"issue";"tag"
-"save";"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"";""
-"save";"Admin";"Wholesale";"M";"John%isolation%";"Jack";"Doe%isolation%";"S";"JohnDoe%isolation%@example.com";"03/16/2004";"-";"Male";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"Bug: MAGETWO-31689";""
-"save";"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"Joe";"Doe";"1 Main Street";"Culver City";"United States";"California";"90230";"3109450345";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"";""
-"save";"Main Website";"Retailer";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.ccc";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerInvalidEmail";"";""
-"save";"Main Website";"General";"-";"Thomas%isolation%";"-";"Oster%isolation%";"-";"Thomas%isolation%@example.com";"-";"5250008057";"-";"Thomas";"Oster";"Chmielna 113";"Bielsko-Biala";"Poland";"-";"43-310 ";"799885616";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"";""
-"saveAndContinue";"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerTitle";"";"test_type:acceptance_test"
+"description";"customerAction";"customer/data/website_id";"customer/data/group_id/dataSet";"customer/data/prefix";"customer/data/firstname";"customer/data/middlename";"customer/data/lastname";"customer/data/suffix";"customer/data/email";"customer/data/dob";"customer/data/taxvat";"customer/data/gender";"address/data/firstname";"address/data/lastname";"address/data/street";"address/data/city";"address/data/country_id";"address/data/region_id";"address/data/postcode";"address/data/telephone";"constraint";"issue";"tag"
+"General customer without address";"save";"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"";""
+"Customer with prefix";"save";"Admin";"Wholesale";"M";"John%isolation%";"Jack";"Doe%isolation%";"S";"JohnDoe%isolation%@example.com";"03/16/2004";"-";"Male";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"Bug: MAGETWO-31689";""
+"General customer from USA";"save";"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"Joe";"Doe";"1 Main Street";"Culver City";"United States";"California";"90230";"3109450345";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"";""
+"Retailer customer without address";"save";"Main Website";"Retailer";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.ccc";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerInvalidEmail";"";""
+"General customer from Poland";"save";"Main Website";"General";"-";"Thomas%isolation%";"-";"Oster%isolation%";"-";"Thomas%isolation%@example.com";"-";"5250008057";"-";"Thomas";"Oster";"Chmielna 113";"Bielsko-Biala";"Poland";"-";"43-310 ";"799885616";"assertCustomerSuccessSaveMessage, assertCustomerInGrid, assertCustomerForm";"";""
+"MAGETWO-12516: Create New Customer on Backend";"saveAndContinue";"Main Website";"General";"-";"John%isolation%";"-";"Doe%isolation%";"-";"JohnDoe%isolation%@example.com";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"-";"assertCustomerSuccessSaveMessage, assertCustomerBackendFormTitle";"";"test_type:acceptance_test"
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php b/dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/ForgotPasswordOnFrontendTest.php
@@ -20,7 +20,7 @@ class ForgotPasswordOnFrontendTest extends Functional
     public function testForgotPassword()
     {
         // Create Customer
-        $customer = ObjectManager::getInstance()->create(
+        $customer = $this->objectManager->getInstance()->create(
             'Magento\Customer\Test\Fixture\Customer',
             ['dataSet' => 'customer_US_1']
         );
diff --git a/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml b/dev/tests/functional/tests/app/Magento/Customer/Test/etc/constraint.xml
@@ -46,9 +46,9 @@
             <pageCustomerIndexEdit class="Magento\Customer\Test\Page\Adminhtml\CustomerIndexEdit" />
         </require>
     </assertCustomerForm>
-    <assertCustomerTitle module="Magento_Customer">
+    <assertCustomerBackendFormTitle module="Magento_Customer">
         <severity>middle</severity>
-    </assertCustomerTitle>
+    </assertCustomerBackendFormTitle>
     <assertCustomerInvalidEmail module="Magento_Customer">
         <severity>middle</severity>
         <require>

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`/**`
`14`	`14`	`* Assert that edit page of customer account contains correct title.`
`15`	`15`	`*/`
`16`		`-class AssertCustomerTitle extends AbstractConstraint`
	`16`	`+class AssertCustomerBackendFormTitle extends AbstractConstraint`
`17`	`17`	`{`
`18`	`18`	`/* tags */`
`19`	`19`	`const SEVERITY = 'middle';`
`@@ -42,6 +42,6 @@ public function processAssert(CustomerAccountIndex $pageCustomerIndex, Customer`
`42`	`42`	`*/`
`43`	`43`	`public function toString()`
`44`	`44`	`{`
`45`		`- return 'Assert that title is correct.';`
	`45`	`+ return 'Customer backend edit form title is correct.';`
`46`	`46`	`}`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ class ForgotPasswordOnFrontendTest extends Functional`
`20`	`20`	`public function testForgotPassword()`
`21`	`21`	`{`
`22`	`22`	`// Create Customer`
`23`		`- $customer = ObjectManager::getInstance()->create(`
	`23`	`+ $customer = $this->objectManager->getInstance()->create(`
`24`	`24`	`'Magento\Customer\Test\Fixture\Customer',`
`25`	`25`	`['dataSet' => 'customer_US_1']`
`26`	`26`	`);`