Skip to content

Commit 14b66e8

Browse files
authored
Merge pull request #285 from magento/2.3
Fetched latest Allure Codeception Adapter to resolve conflict with PHPUnit Allure adapter
2 parents 3ca1bd7 + 28470cd commit 14b66e8

File tree

5 files changed

+14
-10
lines changed

5 files changed

+14
-10
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
2.3.12
4+
-----
5+
### Enhancements
6+
* Fetched latest allure-codeception package
37

48
2.3.11
59
-----

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"require": {
1212
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
13-
"allure-framework/allure-codeception": "~1.2.6",
13+
"allure-framework/allure-codeception": "~1.3.0",
1414
"codeception/codeception": "~2.3.4",
1515
"consolidation/robo": "^1.0.0",
1616
"epfremme/swagger-php": "^2.0",

composer.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

etc/config/codeception.dist.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extensions:
1616
- Magento\FunctionalTestingFramework\Extension\TestContextExtension
1717
- Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter
1818
config:
19-
Yandex\Allure\Adapter\AllureAdapter:
19+
Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter:
2020
deletePreviousResults: true
2121
outputDirectory: allure-results
2222
ignoredAnnotations:

src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
use Magento\FunctionalTestingFramework\Data\Argument\Interpreter\NullType;
99
use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
10-
use Yandex\Allure\Adapter\AllureAdapter;
10+
use Yandex\Allure\Codeception\AllureCodeception;
1111
use Yandex\Allure\Adapter\Event\StepStartedEvent;
1212
use Codeception\Event\SuiteEvent;
1313
use Codeception\Event\StepEvent;
@@ -20,7 +20,7 @@
2020
* @package Magento\FunctionalTestingFramework\Allure
2121
*/
2222

23-
class MagentoAllureAdapter extends AllureAdapter
23+
class MagentoAllureAdapter extends AllureCodeception
2424
{
2525
/**
2626
* Array of group values passed to test runner command

0 commit comments

Comments
 (0)