MTA-3333: Deliver functional test fixes that were made during regression testing

Author: lanken

dev/tests/functional/tests/app/Magento/Catalog/Test/Fixture/Product/TierPrice.php

@@ -26,6 +26,27 @@ class TierPrice extends DataSource
      */
     private $customerGroups;
 
+    /**
+     * Repository Factory instance.
+     *
+     * @var RepositoryFactory
+     */
+    private $repositoryFactory;
+
+    /**
+     * Fixture Factory instance.
+     *
+     * @var FixtureFactory
+     */
+    private $fixtureFactory;
+
+    /**
+     * Rought fixture field data.
+     *
+     * @var array
+     */
+    private $fixtureData = null;
+
     /**
      * @constructor
      * @param RepositoryFactory $repositoryFactory
@@ -40,14 +61,28 @@ public function __construct(
         array $params,
         $data = []
     ) {
+        $this->repositoryFactory = $repositoryFactory;
+        $this->fixtureFactory = $fixtureFactory;
         $this->params = $params;
-        if (!isset($data['dataset'])) {
+        $this->fixtureData = $data;
+    }
+
+    /**
+     * Return prepared data set.
+     *
+     * @param string $key [optional]
+     * @return mixed
+     * @throws \Exception
+     */
+    public function getData($key = null)
+    {
+        if (!isset($this->fixtureData['dataset'])) {
             throw new \Exception("Data must be set");
         }
-        $this->data = $repositoryFactory->get($this->params['repository'])->get($data['dataset']);
+        $this->data = $this->repositoryFactory->get($this->params['repository'])->get($this->fixtureData['dataset']);
         foreach ($this->data as $key => $item) {
             /** @var CustomerGroup $customerGroup */
-            $customerGroup = $fixtureFactory->createByCode(
+            $customerGroup = $this->fixtureFactory->createByCode(
                 'customerGroup',
                 ['dataset' => $item['customer_group']['dataset']]
             );
@@ -57,6 +92,8 @@ public function __construct(
             $this->data[$key]['customer_group'] = $customerGroup->getCustomerGroupCode();
             $this->customerGroups[$key] = $customerGroup;
         }
+
+        return parent::getData($key);
     }
 
     /**

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

@@ -79,7 +79,7 @@ public function fillCustomer(FixtureInterface $customer, $address = null)
      *
      * @param FixtureInterface $customer
      * @param FixtureInterface|FixtureInterface[]|null $address
-     * @param Address $addressToDelete = null
+     * @param Address|null $addressToDelete
      * @return $this
      */
     public function updateCustomer(FixtureInterface $customer, $address = null, Address $addressToDelete = null)

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertAddressDeletedFrontend.php

@@ -32,9 +32,8 @@ public function processAssert(
         Customer $customer,
         Address $addressToDelete
     ) {
-
         $this->objectManager->create(
-            'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
+            \Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep::class,
             ['customer' => $customer]
         )->run();
 

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupFieldDisabled.php renamed to dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerGroupFieldsDisabled.php

@@ -11,12 +11,12 @@
 use Magento\Customer\Test\Page\Adminhtml\CustomerGroupEdit;
 
 /**
- * Assert that group field is not available.
+ * Assert that group fields are not available.
  */
-class AssertCustomerGroupFieldDisabled extends AbstractConstraint
+class AssertCustomerGroupFieldsDisabled extends AbstractConstraint
 {
     /**
-     * Assert that field is disabled on customer group form.
+     * Assert that fields are disabled on customer group form.
      *
      * @param CustomerGroupEdit $customerGroupEdit
      * @param array $disabledFields
@@ -35,12 +35,12 @@ public function processAssert(
     }
 
     /**
-     * Success assert of customer group field not available.
+     * Success assert of customer fields are not available.
      *
      * @return string
      */
     public function toString()
     {
-        return 'Customer group field is not available.';
+        return 'Customer fields are not available.';
     }
 }

dev/tests/functional/tests/app/Magento/Customer/Test/Constraint/AssertCustomerNameFrontend.php

@@ -33,7 +33,7 @@ public function processAssert(
 
         $customerAccountIndex->open();
         $infoBlock = $customerAccountIndex->getInfoBlock()->getContactInfoContent();
-        $infoBlock = explode("\n", $infoBlock);
+        $infoBlock = explode(PHP_EOL, $infoBlock);
         $nameInDashboard = $infoBlock[0];
         \PHPUnit_Framework_Assert::assertTrue(
             $nameInDashboard == $customerName,

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/UpdateCustomerBackendEntityTest.php

@@ -87,7 +87,7 @@ public function __inject(
      * @param Customer $customer
      * @param Customer $initialCustomer
      * @param Address|null $address
-     * @param Address $addressToDelete
+     * @param Address|null $addressToDelete
      * @return Customer
      */
     private function prepareCustomer(
@@ -125,8 +125,8 @@ private function prepareCustomer(
      *
      * @param Customer $initialCustomer
      * @param Customer $customer
-     * @param Address $address [optional]
-     * @param int $addressIndexToDelete [optional]
+     * @param Address|null $address
+     * @param int|null $addressIndexToDelete
      * @throws \Exception
      * @return array
      */

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/VerifyDisabledCustomerGroupFieldTest.xml

@@ -12,7 +12,7 @@
             <data name="disabledFields" xsi:type="array">
                 <item name="0" xsi:type="string">customer_group_code</item>
             </data>
-            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupFieldDisabled" />
+            <constraint name="Magento\Customer\Test\Constraint\AssertCustomerGroupFieldsDisabled" />
         </variation>
     </testCase>
 </config>