Skip to content

Commit 60ae2bf

Browse files
authored
Merge branch 'magento-commerce:develop' into ACQE-2580
2 parents bdcde5c + 5238edb commit 60ae2bf

File tree

4 files changed

+31
-8
lines changed

4 files changed

+31
-8
lines changed

CHANGELOG.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,25 @@
11
Magento Functional Testing Framework Changelog
22
================================================
33

4+
4.0.1
5+
---------
6+
### Fixes
7+
8+
* Fixed HTML files and images not attached to allure report issue
9+
10+
4.0.0
11+
---------
12+
### Enhancements
13+
14+
* Added Supported for PHP 8.2 and enabled PR checks for PHP 8.2
15+
* Dropped Support for PHP 7.4 and disabled PR checks for PHP 7.4
16+
* Upgraded allure-framework/allure-phpunit to its latest version
17+
18+
### Fixes
19+
20+
* MFTF deprecation errors fixes
21+
* Composer downgraded from 2.4 to 2.2 due to lamina issue
22+
423
3.12.0
524
---------
625

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.12.0",
5+
"version": "4.0.1",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

composer.lock

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

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
use Yandex\Allure\Adapter\Support\AttachmentSupport;
3131
use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
3232
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
33+
use Yandex\Allure\Adapter\Allure as YandexAllure;
34+
use Yandex\Allure\Adapter\Event\AddAttachmentEvent;
3335

3436
/**
3537
* MagentoWebDriver module provides common Magento web actions through Selenium WebDriver.
@@ -908,12 +910,14 @@ public function _failed(TestInterface $test, $fail)
908910
}
909911

910912
if ($this->current_test === null) {
911-
throw new \RuntimeException("Suite condition failure: \n" . $fail->getMessage());
913+
throw new \RuntimeEcleaxception("Suite condition failure: \n"
914+
. " Something went wrong with selenium server/chrome driver : \n .
915+
{$fail->getMessage()}\n{$fail->getTraceAsString()}");
912916
}
913-
914-
$this->addAttachment($this->pngReport, $test->getMetadata()->getName() . '.png', 'image/png');
915-
$this->addAttachment($this->htmlReport, $test->getMetadata()->getName() . '.html', 'text/html');
916-
917+
YandexAllure::lifecycle()
918+
->fire(new AddAttachmentEvent($this->pngReport, $test->getMetadata()->getName() . '.png', 'image/png'));
919+
YandexAllure::lifecycle()
920+
->fire(new AddAttachmentEvent($this->htmlReport, $test->getMetadata()->getName() . '.html', 'text/html'));
917921
$this->debug("Failure due to : {$fail->getMessage()}");
918922
$this->debug("Screenshot saved to {$this->pngReport}");
919923
$this->debug("Html saved to {$this->htmlReport}");

0 commit comments

Comments
 (0)