MTA-2236: Sync qmt repository with mainline - Sprint 14

- Fixed static test fails

Author: Oleksandr Manchenko

dev/tests/functional/tests/app/Magento/Tax/Test/Block/Adminhtml/Rule/Edit/Form.php

@@ -316,7 +316,7 @@ public function getAllTaxRates()
     public function isTaxRateAvailable($value)
     {
         /** @var \Magento\Mtf\Client\Element\MultiselectlistElement $taxRate */
-        $taxRate = $taxRates = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
+        $taxRate = $this->_rootElement->find($this->taxRateBlock, Locator::SELECTOR_CSS, 'multiselectlist');
         return $taxRate->isValueVisible($value);
     }
 }

dev/tests/functional/tests/app/Magento/Wishlist/Test/TestCase/ShareWishlistEntityTest.php

@@ -7,10 +7,8 @@
 namespace Magento\Wishlist\Test\TestCase;
 
 use Magento\Catalog\Test\Fixture\CatalogProductSimple;
-use Magento\Catalog\Test\Page\Product\CatalogProductView;
 use Magento\Cms\Test\Page\CmsIndex;
 use Magento\Customer\Test\Fixture\Customer;
-use Magento\Customer\Test\Page\CustomerAccountIndex;
 use Magento\Wishlist\Test\Page\WishlistIndex;
 use Magento\Wishlist\Test\Page\WishlistShare;
 use Magento\Mtf\Client\BrowserInterface;
@@ -31,6 +29,8 @@
  *
  * @group Wishlist_(CS)
  * @ZephyrId MAGETWO-23394
+ *
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
  */
 class ShareWishlistEntityTest extends Injectable
 {
@@ -46,20 +46,6 @@ class ShareWishlistEntityTest extends Injectable
      */
     protected $cmsIndex;
 
-    /**
-     * Customer account index page.
-     *
-     * @var CustomerAccountIndex
-     */
-    protected $customerAccountIndex;
-
-    /**
-     * Product view page.
-     *
-     * @var CatalogProductView
-     */
-    protected $catalogProductView;
-
     /**
      * Wishlist index page.
      *
@@ -81,10 +67,8 @@ class ShareWishlistEntityTest extends Injectable
      * @param CatalogProductSimple $product
      * @return array
      */
-    public function __prepare(
-        Customer $customer,
-        CatalogProductSimple $product
-    ) {
+    public function __prepare(Customer $customer, CatalogProductSimple $product)
+    {
         $customer->persist();
         $product->persist();
 
@@ -98,22 +82,16 @@ public function __prepare(
      * Inject pages.
      *
      * @param CmsIndex $cmsIndex
-     * @param CustomerAccountIndex $customerAccountIndex
-     * @param CatalogProductView $catalogProductView
      * @param WishlistIndex $wishlistIndex
      * @param WishlistShare $wishlistShare
      * @return void
      */
     public function __inject(
         CmsIndex $cmsIndex,
-        CustomerAccountIndex $customerAccountIndex,
-        CatalogProductView $catalogProductView,
         WishlistIndex $wishlistIndex,
         WishlistShare $wishlistShare
     ) {
         $this->cmsIndex = $cmsIndex;
-        $this->customerAccountIndex = $customerAccountIndex;
-        $this->catalogProductView = $catalogProductView;
         $this->wishlistIndex = $wishlistIndex;
         $this->wishlistShare = $wishlistShare;
     }
@@ -134,27 +112,18 @@ public function test(
         array $sharingInfo
     ) {
         //Steps
-        $this->loginCustomer($customer);
-        $browser->open($_ENV['app_frontend_url'] . $product->getUrlKey() . '.html');
-        $this->catalogProductView->getViewBlock()->clickAddToWishlist();
+        $this->objectManager->create(
+            'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
+            ['customer' => $customer]
+        )->run();
+        $this->objectManager->create(
+            'Magento\Wishlist\Test\TestStep\AddProductsToWishlistStep',
+            ['products' => [$product]]
+        )->run();
         $this->wishlistIndex->getMessagesBlock()->waitSuccessMessage();
         $this->wishlistIndex->getWishlistBlock()->clickShareWishList();
         $this->cmsIndex->getCmsPageBlock()->waitPageInit();
         $this->wishlistShare->getSharingInfoForm()->fillForm($sharingInfo);
         $this->wishlistShare->getSharingInfoForm()->shareWishlist();
     }
-
-    /**
-     * Login customer.
-     *
-     * @param Customer $customer
-     * @return void
-     */
-    protected function loginCustomer(Customer $customer)
-    {
-        $this->objectManager->create(
-            'Magento\Customer\Test\TestStep\LoginCustomerOnFrontendStep',
-            ['customer' => $customer]
-        )->run();
-    }
 }