Merge pull request #143 from magento-commerce/develop

MQE-3155: Prepare MFTF 3.7.3 release
magento · Dec 16, 2021 · 40dd3eb · 40dd3eb
2 parents 4488b62 + da431d6
commit 40dd3eb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 Magento Functional Testing Framework Changelog
 ================================================
+3.7.3
+---------
+
+### Updates:
+* Fix encoding issue when secret key contains plus sign
+* Adding pagebuilder file upload spinner to loadingMaskLocators
+
+
 3.7.2
 ---------
 

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "3.7.2",
+    "version": "3.7.3",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
@@ -72,6 +72,9 @@ class MagentoWebDriver extends WebDriver
         '//div[contains(@class, "admin__data-grid-loading-mask")]',
         '//div[contains(@class, "admin__form-loading-mask")]',
         '//div[@data-role="spinner"]',
+        '//div[contains(@class,"file-uploader-spinner")]',
+        '//div[contains(@class,"image-uploader-spinner")]',
+        '//div[contains(@class,"uploader")]//div[@class="file-row"]',
     ];
 
     /**
@@ -571,7 +574,7 @@ public function magentoCLI($command, $timeout = null, $arguments = null)
             $apiURL,
             [
                 'token' => WebApiAuth::getAdminToken(),
-                getenv('MAGENTO_CLI_COMMAND_PARAMETER') => $command,
+                getenv('MAGENTO_CLI_COMMAND_PARAMETER') => urlencode($command),
                 'arguments' => $arguments,
                 'timeout'   => $timeout,
             ],