Merge pull request #421 from magento/MFTF-2.4.4

MFTF 2.4.4 - Merge to Master
magento · Aug 15, 2019 · ab347cf · ab347cf
2 parents 45f0233 + 1bdb14e
commit ab347cf
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.4.4
+-----
+### Fixes
+* Fixed an issue where `_CREDS` could not be resolved when used in a suite.
+
 2.4.3
 -----
 * Customizability

diff --git a/bin/mftf b/bin/mftf
@@ -29,7 +29,7 @@ try {
 try {
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
-    $application->setVersion('2.4.3');
+    $application->setVersion('2.4.4');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

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": "2.4.3",
+    "version": "2.4.4",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/verification/Resources/functionalSuiteHooks.txt b/dev/tests/verification/Resources/functionalSuiteHooks.txt
@@ -3,6 +3,7 @@
 namespace Group;
 
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.

diff --git a/dev/tests/verification/Resources/functionalSuiteWithComments.txt b/dev/tests/verification/Resources/functionalSuiteWithComments.txt
@@ -3,6 +3,7 @@
 namespace Group;
 
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.

diff --git a/etc/config/command.php b/etc/config/command.php
@@ -12,8 +12,8 @@
     $tokenModel = $magentoObjectManager->get(\Magento\Integration\Model\Oauth\Token::class);
 
     $tokenPassedIn = urldecode($_POST['token']);
-    $command = urldecode($_POST['command']);
-    $arguments = urldecode($_POST['arguments']);
+    $command = str_replace([';', '&', '|'], '', urldecode($_POST['command']));
+    $arguments = str_replace([';', '&', '|'], '', urldecode($_POST['arguments']));
 
     // Token returned will be null if the token we passed in is invalid
     $tokenFromMagento = $tokenModel->loadByToken($tokenPassedIn)->getToken();

diff --git a/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache b/src/Magento/FunctionalTestingFramework/Suite/views/SuiteClass.mustache
@@ -3,6 +3,7 @@
 namespace Group;
 
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.