From 3bf88ed63b3803f5c273f10004e97ec670cfb9e3 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Fri, 30 Aug 2019 10:30:30 -0500 Subject: [PATCH 1/2] MQE-1715: .credentials file must exist but it should not have to - Added try/catch logic to problem area. --- .../DataGenerator/Handlers/PersistedObjectHandler.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/PersistedObjectHandler.php b/src/Magento/FunctionalTestingFramework/DataGenerator/Handlers/PersistedObjectHandler.php index cc35bbc52..ab8844089 100644 --- 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); From 9015ee9373c8193ff28ddb714b7abceb6960f719 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Fri, 30 Aug 2019 10:45:40 -0500 Subject: [PATCH 2/2] MQE-1715: .credentials file must exist but it should not have to - composer and lock file update - changelog update --- CHANGELOG.md | 5 +++++ bin/mftf | 2 +- composer.json | 2 +- composer.lock | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d3f82a2f9..928b5a670 100644 --- 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 `` actions with field overrides. + 2.4.4 ----- ### Fixes diff --git a/bin/mftf b/bin/mftf index 0f2bf274d..4bca4f620 100755 --- 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 index bc36fb60e..c4bde5cd3 100755 --- 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 index d415acc0a..1eeed1efc 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b1795ca4e2c9a15582db44baf54962ad", + "content-hash": "e10b0bbd1baa544f5efae43a6cfbed08", "packages": [ { "name": "allure-framework/allure-codeception",