MTO-95: PRs stabilization

- Fixed name conflict.

Author: Vadim Zubovich

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

@@ -46,7 +46,7 @@ class Shipping extends Form
      *
      * @var string
      */
-    private $newAddressButton = '.action-show-popup';
+    private $popupSelector = '.action-show-popup';
 
     /**
      * Locator for address select button.
@@ -80,16 +80,6 @@ public function clickOnNewAddressButton()
         $this->_rootElement->find($this->newAddressButton)->click();
     }
 
-    /**
-     * 'Ship here' button click.
-     *
-     * @return void
-     */
-    public function clickShipHere()
-    {
-        $this->_rootElement->find($this->shipHereButton, Locator::SELECTOR_XPATH)->click();
-    }
-
     /**
      * Get Address Modal Block.
      *
@@ -151,24 +141,13 @@ public function isAddressSelected($address)
         return $text == $address;
     }
 
-    /**
-     * Checks if new address button is visible.
-     *
-     * @return bool
-     */
-    public function isNewAddressButtonVisible()
-    {
-        $button = $this->_rootElement->find($this->newAddressButton);
-        return $button->isVisible();
-    }
-
     /**
      * Clicks new address button.
      *
      * @return void
      */
-    public function clickNewAddressButton()
+    public function clickPopupNewAddressButton()
     {
-        $this->_rootElement->find($this->newAddressButton)->click();
+        $this->_rootElement->find($this->popupSelector)->click();
     }
 }

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

@@ -102,7 +102,7 @@ public function run()
                 'address',
                 ['dataset' => $this->shippingAddressCustomer['new']]
             );
-            $this->checkoutOnepage->getShippingBlock()->clickNewAddressButton();
+            $this->checkoutOnepage->getShippingBlock()->clickPopupNewAddressButton();
             $this->checkoutOnepage->getShippingAddressPopupBlock()->fill($shippingAddress)->clickSaveAddressButton();
         }
         if (isset($this->shippingAddressCustomer['added'])) {