MQE-2212: Fix invalid behaviour MAGENTO_BACKEND_BASE_URL

Author: soumyau

src/Magento/FunctionalTestingFramework/DataTransport/AdminFormExecutor.php

@@ -12,7 +12,7 @@
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\DataTransport\Auth\Tfa\OTP;
 use Magento\FunctionalTestingFramework\DataTransport\Auth\Tfa;
-use Magento\FunctionalTestingFramework\Provider\UrlProvider;
+use Magento\FunctionalTestingFramework\Util\Provider\UrlProvider;
 
 /**
  * Curl executor for requests to Admin.
@@ -46,6 +46,12 @@ class AdminFormExecutor implements CurlInterface
      */
     private $removeBackend;
 
+    /**
+     * Base url.
+     * @var string
+     */
+    private $baseUrl;
+
     /**
      * Constructor.
      * @param boolean $removeBackend
@@ -58,6 +64,7 @@ public function __construct($removeBackend)
         $this->removeBackend = $removeBackend;
         $this->transport = new CurlTransport();
         $this->authorize();
+        $this->baseUrl = $this->getBaseUrl();
     }
 
     /**
@@ -79,11 +86,11 @@ public function getBaseUrl(): string
     private function authorize()
     {
         // Perform GET to backend url so form_key is set
-        $this->transport->write($this->getBaseUrl(), [], CurlInterface::GET);
+        $this->transport->write($this->baseUrl, [], CurlInterface::GET);
         $this->read();
 
         // Authenticate admin user
-        $authUrl = $this->getBaseUrl() . 'admin/auth/login/';
+        $authUrl = $this->baseUrl . 'admin/auth/login/';
         $data = [
             'login[username]' => getenv('MAGENTO_ADMIN_USERNAME'),
             'login[password]' => getenv('MAGENTO_ADMIN_PASSWORD'),
@@ -98,7 +105,7 @@ private function authorize()
 
         // Get OTP
         if (Tfa::isEnabled()) {
-            $authUrl = $this->getBaseUrl() . Tfa::getProviderAdminFormEndpoint('google');
+            $authUrl = $this->baseUrl . Tfa::getProviderAdminFormEndpoint('google');
             $data = [
                 'tfa_code' => OTP::getOTP(),
                 'form_key' => $this->formKey,
@@ -138,7 +145,7 @@ private function setFormKey()
     public function write($url, $data = [], $method = CurlInterface::POST, $headers = [])
     {
         $url = ltrim($url, "/");
-        $apiUrl = $this->getBaseUrl() . $url;
+        $apiUrl = $this->baseUrl . $url;
 
         if ($this->removeBackend) {
             //TODO

src/Magento/FunctionalTestingFramework/DataTransport/Auth/Tfa.php

@@ -9,7 +9,7 @@
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlInterface;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlTransport;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
-use Magento\FunctionalTestingFramework\Provider\UrlProvider;
+use Magento\FunctionalTestingFramework\Util\Provider\UrlProvider;
 
 /**
  * Class Tfa (i.e. 2FA)

src/Magento/FunctionalTestingFramework/DataTransport/Auth/WebApiAuth.php

@@ -10,7 +10,7 @@
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlTransport;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\DataTransport\Auth\Tfa\OTP;
-use Magento\FunctionalTestingFramework\Provider\UrlProvider;
+use Magento\FunctionalTestingFramework\Util\Provider\UrlProvider;
 
 /**
  * Class WebApiAuth

src/Magento/FunctionalTestingFramework/DataTransport/FrontendFormExecutor.php

@@ -6,7 +6,7 @@
 
 namespace Magento\FunctionalTestingFramework\DataTransport;
 
-use Magento\FunctionalTestingFramework\Provider\UrlProvider;
+use Magento\FunctionalTestingFramework\Util\Provider\UrlProvider;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlInterface;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlTransport;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
@@ -58,6 +58,11 @@ class FrontendFormExecutor implements CurlInterface
      */
     private $customerPassword;
 
+    /**
+     * Base url
+     */
+    private $baseUrl;
+
     /**
      * FrontendFormExecutor constructor.
      *
@@ -72,6 +77,7 @@ public function __construct($customerEmail, $customerPassWord)
         $this->customerEmail = $customerEmail;
         $this->customerPassword = $customerPassWord;
         $this->authorize();
+        $this->baseUrl = UrlProvider::getBaseUrl();
     }
 
     /**
@@ -82,11 +88,11 @@ public function __construct($customerEmail, $customerPassWord)
      */
     private function authorize()
     {
-        $url = UrlProvider::getBaseUrl() . 'customer/account/login/';
+        $url = $this->baseUrl . 'customer/account/login/';
         $this->transport->write($url, [], CurlInterface::GET);
         $this->read();
 
-        $url = UrlProvider::getBaseUrl() . 'customer/account/loginPost/';
+        $url = $this->baseUrl . 'customer/account/loginPost/';
         $data = [
             'login[username]' => $this->customerEmail,
             'login[password]' => $this->customerPassword,
@@ -144,7 +150,7 @@ public function write($url, $data = [], $method = CurlInterface::POST, $headers
         if (isset($data['customer_password'])) {
             unset($data['customer_password']);
         }
-        $apiUrl = UrlProvider::getBaseUrl() . $url;
+        $apiUrl = $this->baseUrl . $url;
         if ($this->formKey) {
             $data['form_key'] = $this->formKey;
         } else {

src/Magento/FunctionalTestingFramework/DataTransport/WebApiExecutor.php

@@ -10,7 +10,7 @@
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlInterface;
 use Magento\FunctionalTestingFramework\DataTransport\Protocol\CurlTransport;
 use Magento\FunctionalTestingFramework\DataTransport\Auth\WebApiAuth;
-use Magento\FunctionalTestingFramework\Provider\UrlProvider;
+use Magento\FunctionalTestingFramework\Util\Provider\UrlProvider;
 
 /**
  * Curl executor for Magento Web Api requests.

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriverDoctor.php

@@ -9,7 +9,7 @@
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Facebook\WebDriver\Remote\RemoteWebDriver;
 use Magento\FunctionalTestingFramework\Page\Objects\PageObject;
-use Magento\FunctionalTestingFramework\Provider\UrlProvider;
+use Magento\FunctionalTestingFramework\Util\Provider\UrlProvider;
 
 /**
  * MagentoWebDriverDoctor module extends MagentoWebDriver module and is a light weighted module to diagnose webdriver

src/Magento/FunctionalTestingFramework/Provider/UrlProvider.php renamed to src/Magento/FunctionalTestingFramework/Util/Provider/UrlProvider.php

@@ -4,7 +4,7 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\FunctionalTestingFramework\Provider;
+namespace Magento\FunctionalTestingFramework\Util\Provider;
 
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\Page\Objects\PageObject;
@@ -32,7 +32,6 @@ class UrlProvider
      */
     public static function getBaseUrl($customArea = null, $withTrailingSeparator = true)
     {
-
         try {
             $baseUrl = getenv('MAGENTO_BASE_URL');
 
@@ -68,7 +67,7 @@ public static function getBaseUrl($customArea = null, $withTrailingSeparator = t
      * @return string|null
      * @throws TestFrameworkException
      */
-    public static function getBackendBaseUrl($withTrailingSeparator = true)
+    private static function getBackendBaseUrl($withTrailingSeparator = true)
     {
         $bUrl = getenv('MAGENTO_BACKEND_BASE_URL');