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

Author: orykh

dev/tests/functional/tests/app/Magento/Catalog/Test/TestCase/Product/AbstractCompareProductsTest.php

@@ -9,7 +9,7 @@
 use Magento\Catalog\Test\Page\Product\CatalogProductCompare;
 use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Customer\Test\Page\CustomerAccountLogin;
 use Magento\Mtf\Client\BrowserInterface;
 use Magento\Mtf\Constraint\AbstractConstraint;
@@ -76,18 +76,18 @@ abstract class AbstractCompareProductsTest extends Injectable
     /**
      * Fixture customer.
      *
-     * @var CustomerInjectable
+     * @var Customer
      */
     protected $customer;
 
     /**
      * Prepare data.
      *
      * @param FixtureFactory $fixtureFactory
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      * @return void
      */
-    public function __prepare(FixtureFactory $fixtureFactory, CustomerInjectable $customer)
+    public function __prepare(FixtureFactory $fixtureFactory, Customer $customer)
     {
         $this->fixtureFactory = $fixtureFactory;
         $customer->persist();

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

@@ -6,7 +6,7 @@
 
 namespace Magento\Checkout\Test\Block\Cart;
 
-use Magento\Customer\Test\Fixture\AddressInjectable;
+use Magento\Customer\Test\Fixture\Address;
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Locator;
 
@@ -99,10 +99,10 @@ public function selectShippingMethod(array $shipping)
     /**
      * Fill shipping and tax form
      *
-     * @param AddressInjectable $address
+     * @param Address $address
      * @return void
      */
-    public function fillEstimateShippingAndTax(AddressInjectable $address)
+    public function fillEstimateShippingAndTax(Address $address)
     {
         $this->openEstimateShippingAndTax();
         $this->fill($address);

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Billing.php

@@ -6,8 +6,8 @@
 
 namespace Magento\Checkout\Test\Block\Onepage;
 
-use Magento\Customer\Test\Fixture\AddressInjectable;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Address;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\Block\Form;
 
 /**
@@ -40,14 +40,14 @@ class Billing extends Form
     /**
      * Fill billing address
      *
-     * @param AddressInjectable $billingAddress
-     * @param CustomerInjectable $customer
+     * @param Address $billingAddress
+     * @param Customer $customer
      * @param bool $isShippingAddress
      * @return void
      */
     public function fillBilling(
-        AddressInjectable $billingAddress = null,
-        CustomerInjectable $customer = null,
+        Address $billingAddress = null,
+        Customer $customer = null,
         $isShippingAddress = false
     ) {
         if ($billingAddress) {

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/FillBillingInformationStep.php

@@ -7,8 +7,8 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Magento\Customer\Test\Fixture\AddressInjectable;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Address;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
@@ -27,14 +27,14 @@ class FillBillingInformationStep implements TestStepInterface
     /**
      * Address fixture
      *
-     * @var AddressInjectable
+     * @var Address
      */
     protected $billingAddress;
 
     /**
      * Customer fixture
      *
-     * @var CustomerInjectable
+     * @var Customer
      */
     protected $customer;
 
@@ -48,14 +48,14 @@ class FillBillingInformationStep implements TestStepInterface
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
-     * @param AddressInjectable $billingAddress
-     * @param CustomerInjectable $customer
+     * @param Address $billingAddress
+     * @param Customer $customer
      * @param string $checkoutMethod
      */
     public function __construct(
         CheckoutOnepage $checkoutOnepage,
-        AddressInjectable $billingAddress,
-        CustomerInjectable $customer,
+        Address $billingAddress,
+        Customer $customer,
         $checkoutMethod
     ) {
         $this->checkoutOnepage = $checkoutOnepage;

dev/tests/functional/tests/app/Magento/Checkout/Test/TestStep/SelectCheckoutMethodStep.php

@@ -7,7 +7,7 @@
 namespace Magento\Checkout\Test\TestStep;
 
 use Magento\Checkout\Test\Page\CheckoutOnepage;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Customer;
 use Magento\Mtf\TestStep\TestStepInterface;
 
 /**
@@ -33,17 +33,17 @@ class SelectCheckoutMethodStep implements TestStepInterface
     /**
      * Customer fixture
      *
-     * @var CustomerInjectable
+     * @var Customer
      */
     protected $customer;
 
     /**
      * @constructor
      * @param CheckoutOnepage $checkoutOnepage
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      * @param string $checkoutMethod
      */
-    public function __construct(CheckoutOnepage $checkoutOnepage, CustomerInjectable $customer, $checkoutMethod)
+    public function __construct(CheckoutOnepage $checkoutOnepage, Customer $customer, $checkoutMethod)
     {
         $this->checkoutOnepage = $checkoutOnepage;
         $this->checkoutMethod = $checkoutMethod;

dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermAbsentOnCheckout.php

@@ -60,7 +60,7 @@ public function processAssert(
         );
         $product = $createProductsStep->run();
 
-        $billingAddress = $fixtureFactory->createByCode('addressInjectable', ['dataSet' => 'default']);
+        $billingAddress = $fixtureFactory->createByCode('address', ['dataSet' => 'default']);
 
         $browser->open($_ENV['app_frontend_url'] . $product['products'][0]->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->clickAddToCartButton();

dev/tests/functional/tests/app/Magento/CheckoutAgreements/Test/Constraint/AssertTermOnCheckout.php

@@ -71,7 +71,7 @@ public function processAssert(
         );
         $product = $createProductsStep->run();
 
-        $billingAddress = $fixtureFactory->createByCode('addressInjectable', ['dataSet' => 'default']);
+        $billingAddress = $fixtureFactory->createByCode('address', ['dataSet' => 'default']);
 
         $browser->open($_ENV['app_frontend_url'] . $product['products'][0]->getUrlKey() . '.html');
         $catalogProductView->getViewBlock()->clickAddToCartButton();

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Account/AddressesAdditional.php

@@ -5,7 +5,7 @@
  */
 namespace Magento\Customer\Test\Block\Account;
 
-use Magento\Customer\Test\Fixture\AddressInjectable;
+use Magento\Customer\Test\Fixture\Address;
 use Magento\Mtf\Block\Block;
 use Magento\Mtf\Client\Locator;
 
@@ -39,10 +39,10 @@ class AddressesAdditional extends Block
     /**
      * Delete Additional Address
      *
-     * @param AddressInjectable $address
+     * @param Address $address
      * @return void
      */
-    public function deleteAdditionalAddress(AddressInjectable $address)
+    public function deleteAdditionalAddress(Address $address)
     {
         $this->_rootElement->find(sprintf($this->addressSelector, $address->getStreet()), Locator::SELECTOR_XPATH)
             ->find($this->deleteAddressLink)->click();

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Renderer.php

@@ -6,10 +6,10 @@
 
 namespace Magento\Customer\Test\Block\Address;
 
-use Magento\Customer\Test\Fixture\AddressInjectable;
+use Magento\Customer\Test\Fixture\Address;
 
 /**
- * Render output from AddressInjectable fixture according to data format type.
+ * Render output from Address fixture according to data format type.
  */
 class Renderer
 {
@@ -21,18 +21,18 @@ class Renderer
     protected $type;
 
     /**
-     * AddressInjectable fixture.
+     * Address fixture.
      *
-     * @var AddressInjectable
+     * @var Address
      */
     protected $address;
 
     /**
      * @constructor
-     * @param AddressInjectable $address
+     * @param Address $address
      * @param string $type
      */
-    public function __construct(AddressInjectable $address, $type = null)
+    public function __construct(Address $address, $type = null)
     {
         $this->address = $address;
         $this->type = $type;

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Form/CustomerForm.php

@@ -9,7 +9,7 @@
 use Magento\Mtf\Block\Form;
 use Magento\Mtf\Client\Element\SimpleElement;
 use Magento\Mtf\Fixture\FixtureInterface;
-use Magento\Customer\Test\Fixture\CustomerInjectable;
+use Magento\Customer\Test\Fixture\Customer;
 
 /**
  * Customer account edit form.
@@ -56,7 +56,7 @@ public function submit()
      */
     public function fill(FixtureInterface $customer, SimpleElement $element = null)
     {
-        /** @var CustomerInjectable $customer */
+        /** @var Customer $customer */
         if ($customer->hasData()) {
             return parent::fill($customer, $element);
         }
@@ -65,10 +65,10 @@ public function fill(FixtureInterface $customer, SimpleElement $element = null)
     /**
      * Get all error validation messages for fields.
      *
-     * @param CustomerInjectable $customer
+     * @param Customer $customer
      * @return array
      */
-    public function getValidationMessages(CustomerInjectable $customer)
+    public function getValidationMessages(Customer $customer)
     {
         $messages = [];
         foreach (array_keys($customer->getData()) as $field) {