Merge pull request #438 from magento/MQE-1715

okolesnyk · web-flow · commit d9de524babec · 2019-08-30T13:17:27.000-05:00
MQE-1715: .credentials file must exist but it should not have to
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.4.5
+-----
+### Fixes
+* Fixed an issue where `.credentials` was required when using `<createData>` actions with field overrides.
+
 2.4.4
 -----
 ### Fixes
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.4');
+    $application->setVersion('2.4.5');
     /** @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.4",
+    "version": "2.4.5",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/PersistedObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/PersistedObjectHandler.php
@@ -8,6 +8,7 @@
 
 use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
 use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;
+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 
 class PersistedObjectHandler
 {
@@ -86,7 +87,12 @@ public function createEntity(
         }
 
         foreach ($overrideFields as $index => $field) {
-            $overrideFields[$index] = CredentialStore::getInstance()->decryptAllSecretsInString($field);
+            try {
+                $overrideFields[$index] = CredentialStore::getInstance()->decryptAllSecretsInString($field);
+            } catch (TestFrameworkException $e) {
+                //do not rethrow if Credentials are not defined
+                $overrideFields[$index] = $field;
+            }
         }
         
         $retrievedEntity = DataObjectHandler::getInstance()->getObject($entity);

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`
`9`	`9`	`use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;`
`10`	`10`	`use Magento\FunctionalTestingFramework\Exceptions\TestReferenceException;`
	`11`	`+use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;`
`11`	`12`
`12`	`13`	`class PersistedObjectHandler`
`13`	`14`	`{`
`@@ -86,7 +87,12 @@ public function createEntity(`
`86`	`87`	`}`
`87`	`88`
`88`	`89`	`foreach ($overrideFields as $index => $field) {`
`89`		`- $overrideFields[$index] = CredentialStore::getInstance()->decryptAllSecretsInString($field);`
	`90`	`+ try {`
	`91`	`+ $overrideFields[$index] = CredentialStore::getInstance()->decryptAllSecretsInString($field);`
	`92`	`+ } catch (TestFrameworkException $e) {`
	`93`	`+ //do not rethrow if Credentials are not defined`
	`94`	`+ $overrideFields[$index] = $field;`
	`95`	`+ }`
`90`	`96`	`}`
`91`	`97`
`92`	`98`	`$retrievedEntity = DataObjectHandler::getInstance()->getObject($entity);`