MTA-3464: Merge Domain Functional Bamboo Plan

- Fix issues found by static tests

Author: okolesnyk

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

@@ -100,23 +100,45 @@ private function prepareCustomer(
             : $initialCustomer->getData();
         $groupId = $customer->hasData('group_id') ? $customer : $initialCustomer;
         $data['group_id'] = ['customerGroup' => $groupId->getDataFieldConfig('group_id')['source']->getCustomerGroup()];
+        $customerAddress = $this->prepareCustomerAddress($initialCustomer, $address, $addressToDelete);
+        if (!empty($customerAddress)) {
+            $data['address'] = $customerAddress;
+        }
+
+        return $this->fixtureFactory->createByCode(
+            'customer',
+            ['data' => $data]
+        );
+    }
+
+    /**
+     * Prepare address for customer entity.
+     *
+     * @param Customer $initialCustomer
+     * @param Address|null $address
+     * @param Address|null $addressToDelete
+     * @return array
+     */
+    private function prepareCustomerAddress(
+        Customer $initialCustomer,
+        Address $address = null,
+        Address $addressToDelete = null
+    ) {
+        $customerAddress = [];
 
         if ($initialCustomer->hasData('address')) {
             $addressesList = $initialCustomer->getDataFieldConfig('address')['source']->getAddresses();
             foreach ($addressesList as $key => $addressFixture) {
                 if ($addressToDelete === null || $addressFixture != $address) {
-                    $data['address'] = ['addresses' => [$key => $addressFixture]];
+                    $customerAddress = ['addresses' => [$key => $addressFixture]];
                 }
             }
         }
         if ($address !== null) {
-            $data['address']['addresses'][] = $address;
+            $customerAddress['addresses'][] = $address;
         }
 
-        return $this->fixtureFactory->createByCode(
-            'customer',
-            ['data' => $data]
-        );
+        return $customerAddress;
     }
 
     /**

dev/tests/functional/tests/app/Magento/Reports/Test/TestCase/ViewedProductsReportEntityTest.php

@@ -62,6 +62,7 @@ class ViewedProductsReportEntityTest extends Injectable
      * @var CatalogProductIndex
      */
     protected $catalogProductIndexPage;
+
     /**
      * Catalog product index page
      *
@@ -149,7 +150,11 @@ protected function openProducts(array $products, $total)
         foreach ($products as $key => $product) {
             for ($i = 0; $i < $total[$key]; $i++) {
                 $this->browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-                $this->assertEquals($product->getName(), $this->cmsIndex->getTitleBlock()->getTitle(), 'Could not open product page');
+                $this->assertEquals(
+                    $product->getName(),
+                    $this->cmsIndex->getTitleBlock()->getTitle(),
+                    'Could not open product page.'
+                );
             }
         }
     }

dev/tests/functional/tests/app/Magento/SalesRule/Test/TestCase/OnePageCheckoutWithDiscountTest.php

@@ -24,4 +24,4 @@ public function test()
     {
         $this->executeScenario();
     }
-}
+}

dev/tests/functional/tests/app/Magento/Vault/Test/TestCase/DeleteSavedCreditCardTest.php

@@ -25,6 +25,7 @@
  *
  * @group Vault
  * @ZephyrId MAGETWO-54059, MAGETWO-54072, MAGETWO-54068, MAGETWO-54015, MAGETWO-54011
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class DeleteSavedCreditCardTest extends Injectable
 {
@@ -33,11 +34,28 @@ class DeleteSavedCreditCardTest extends Injectable
     const TEST_TYPE = '3rd_party_test';
     /* end tags */
 
+    /**
+     * Page for one page checkout.
+     *
+     * @var CheckoutOnepage
+     */
+    private $checkoutOnepage;
+
+    /**
+     * Injection data.
+     *
+     * @param CheckoutOnepage $checkoutOnepage
+     * @return void
+     */
+    public function __inject(CheckoutOnepage $checkoutOnepage)
+    {
+        $this->checkoutOnepage = $checkoutOnepage;
+    }
+
     /**
      * Runs delete saved credit card test.
      *
      * @param AssertCreditCardNotPresentOnCheckout $assertCreditCardNotPresentOnCheckout
-     * @param CheckoutOnepage $checkoutOnepage
      * @param $products
      * @param $configData
      * @param $customer
@@ -46,10 +64,10 @@ class DeleteSavedCreditCardTest extends Injectable
      * @param $shipping
      * @param array $payments
      * @param $creditCardSave
+     * @return void
      */
     public function test(
         AssertCreditCardNotPresentOnCheckout $assertCreditCardNotPresentOnCheckout,
-        CheckoutOnepage $checkoutOnepage,
         $products,
         $configData,
         $customer,
@@ -68,7 +86,7 @@ public function test(
         foreach ($payments as $key => $payment) {
             $this->addToCart($products);
             $this->proceedToCheckout();
-            if($key < 1) { // if this is the first order to be placed
+            if ($key < 1) { // if this is the first order to be placed
                 $this->selectCheckoutMethod($checkoutMethod, $customer);
                 $this->fillShippingAddress($shippingAddress);
             }
@@ -83,7 +101,7 @@ public function test(
         }
         // Delete credit cards from Stored Payment Methods and verify they are not available on checkout
         $paymentsCount = count($payments);
-        for($i = 2; $i < $paymentsCount; $i++) {
+        for ($i = 2; $i < $paymentsCount; $i++) {
             $deletedCard = $this->deleteCreditCardFromMyAccount(
                 $customer,
                 $payments[$i]['creditCard'],
@@ -93,7 +111,7 @@ public function test(
             $this->proceedToCheckout();
             $this->fillShippingMethod($shipping);
             $assertCreditCardNotPresentOnCheckout->processAssert(
-                $checkoutOnepage,
+                $this->checkoutOnepage,
                 $deletedCard['deletedCreditCard']
             );
         }
@@ -243,7 +261,7 @@ protected function saveCreditCard($payment, $creditCardSave)
         );
         $saveCreditCardStep->run();
     }
-    
+
     /**
      * @return void
      */
@@ -254,7 +272,7 @@ protected function fillBillingInformation()
         );
         $fillBillingInformationStep->run();
     }
-    
+
     /**
      * @return void
      */