From 1df8a23f1743257b99ed52f88e8dad82ce587650 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Tue, 18 Dec 2018 17:00:00 -0600 Subject: [PATCH 1/4] MQE-1387: Resolve conflict for allure-codeception and allure-phpunit adaptors --- composer.json | 2 +- composer.lock | 12 ++++++------ etc/config/codeception.dist.yml | 2 +- .../Allure/Adapter/MagentoAllureAdapter.php | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index fe9e6c73f..b37986dc6 100755 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ }, "require": { "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0", - "allure-framework/allure-codeception": "~1.2.6", + "allure-framework/allure-codeception": "~1.3.0", "codeception/codeception": "~2.3.4", "consolidation/robo": "^1.0.0", "epfremme/swagger-php": "^2.0", diff --git a/composer.lock b/composer.lock index 3774a35a6..4eb66074d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,20 +4,20 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "8c1aec6635705d156a60b726ef9eb81e", + "content-hash": "de6d553c95a5721a7d4f6515c7aa15b5", "packages": [ { "name": "allure-framework/allure-codeception", - "version": "1.2.7", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/allure-framework/allure-codeception.git", - "reference": "48598f4b4603b50b663bfe977260113a40912131" + "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/48598f4b4603b50b663bfe977260113a40912131", - "reference": "48598f4b4603b50b663bfe977260113a40912131", + "url": "https://api.github.com/repos/allure-framework/allure-codeception/zipball/9d31d781b3622b028f1f6210bc76ba88438bd518", + "reference": "9d31d781b3622b028f1f6210bc76ba88438bd518", "shasum": "" }, "require": { @@ -55,7 +55,7 @@ "steps", "testing" ], - "time": "2018-03-07T11:18:27+00:00" + "time": "2018-12-18T19:47:23+00:00" }, { "name": "allure-framework/allure-php-api", diff --git a/etc/config/codeception.dist.yml b/etc/config/codeception.dist.yml index a4ea0dcb5..4a4a320b3 100755 --- a/etc/config/codeception.dist.yml +++ b/etc/config/codeception.dist.yml @@ -16,7 +16,7 @@ extensions: - Magento\FunctionalTestingFramework\Extension\TestContextExtension - Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter config: - Yandex\Allure\Adapter\AllureAdapter: + Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter: deletePreviousResults: true outputDirectory: allure-results ignoredAnnotations: diff --git a/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php b/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php index d23af52da..dd435aee4 100644 --- a/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php +++ b/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php @@ -7,7 +7,7 @@ use Magento\FunctionalTestingFramework\Data\Argument\Interpreter\NullType; use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler; -use Yandex\Allure\Adapter\AllureAdapter; +use Yandex\Allure\Codeception\AllureCodeception; use Yandex\Allure\Adapter\Event\StepStartedEvent; use Codeception\Event\SuiteEvent; use Codeception\Event\StepEvent; @@ -20,7 +20,7 @@ * @package Magento\FunctionalTestingFramework\Allure */ -class MagentoAllureAdapter extends AllureAdapter +class MagentoAllureAdapter extends AllureCodeception { /** * Array of group values passed to test runner command From 28470cd19c91d2ec4b2f34d3c676fc607ebd68cb Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Tue, 18 Dec 2018 17:02:33 -0600 Subject: [PATCH 2/4] MQE-1387: Resolve conflict for allure-codeception and allure-phpunit adaptors --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 799238731..f3e191adc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ Magento Functional Testing Framework Changelog ================================================ +2.3.12 +----- +### Enhancements +* Fetched latest allure-codeception package 2.3.11 ----- From 4468f6ac429aed9f6b2e320daf2e530968025195 Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 19 Dec 2018 11:01:49 -0600 Subject: [PATCH 3/4] MQE-1387: Resolve conflict for allure-codeception and allure-phpunit adaptors --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index b37986dc6..4a6e604a6 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.3.11", + "version": "2.3.12", "license": "AGPL-3.0", "keywords": ["magento", "automation", "functional", "testing"], "config": { From 599004be3e14ebbe6fac77de2edbab934d70f19c Mon Sep 17 00:00:00 2001 From: Alex Kolesnyk Date: Wed, 19 Dec 2018 11:04:11 -0600 Subject: [PATCH 4/4] MQE-1387: Resolve conflict for allure-codeception and allure-phpunit adaptors --- bin/mftf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mftf b/bin/mftf index 20ce807ec..b7d928c15 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.3.11'); + $application->setVersion('2.3.12'); /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */ $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList; foreach ($commandList->getCommands() as $command) {