Skip to content

Commit 680d9b9

Browse files
authored
Merge pull request magento#299 from magento/MasterToDevelop-2.3.12
Master to develop 2.3.12
2 parents 727c9c4 + b0f2a13 commit 680d9b9

File tree

6 files changed

+16
-12
lines changed

6 files changed

+16
-12
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
-----

bin/mftf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ try {
2929
try {
3030
$application = new Symfony\Component\Console\Application();
3131
$application->setName('Magento Functional Testing Framework CLI');
32-
$application->setVersion('2.3.11');
32+
$application->setVersion('2.3.12');
3333
/** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
3434
$commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
3535
foreach ($commandList->getCommands() as $command) {

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "2.3.11",
5+
"version": "2.3.12",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
99
"sort-packages": true
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.3.0",
1314
"ext-curl": "*",
14-
"allure-framework/allure-codeception": "~1.2.6",
1515
"codeception/codeception": "~2.3.4",
1616
"consolidation/robo": "^1.0.0",
1717
"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
@@ -15,7 +15,7 @@ extensions:
1515
- Magento\FunctionalTestingFramework\Extension\TestContextExtension
1616
- Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter
1717
config:
18-
Yandex\Allure\Adapter\AllureAdapter:
18+
Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter:
1919
deletePreviousResults: true
2020
outputDirectory: allure-results
2121
ignoredAnnotations:

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
namespace Magento\FunctionalTestingFramework\Allure\Adapter;
77

88
use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
9-
use Yandex\Allure\Adapter\AllureAdapter;
9+
use Yandex\Allure\Codeception\AllureCodeception;
1010
use Yandex\Allure\Adapter\Event\StepStartedEvent;
1111
use Yandex\Allure\Adapter\Event\StepFinishedEvent;
1212
use Yandex\Allure\Adapter\Event\StepFailedEvent;
@@ -23,7 +23,7 @@
2323
* @package Magento\FunctionalTestingFramework\Allure
2424
*/
2525

26-
class MagentoAllureAdapter extends AllureAdapter
26+
class MagentoAllureAdapter extends AllureCodeception
2727
{
2828
/**
2929
* Array of group values passed to test runner command

0 commit comments

Comments
 (0)