Skip to content

Commit 5707e69

Browse files
authored
Merge branch 'develop' into update-credentials-example
2 parents 36d54f2 + 222f751 commit 5707e69

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
4.3.0
4+
---------
5+
### Enhancements
6+
* Bumped `allure-framework/allure-codeception` dependency to `^2.1`.
7+
* Bumped `codeception/codeception` to `^5.0` and upgraded its dependent packages.
8+
* Replaced Yandex methods with Qameta related methods.
9+
* Created methods for modifying step name and for formatting allure.
10+
11+
### Fixes
12+
* Fixed all issues and exceptions thrown after codeception upgrade.
13+
* Removed dependency of MagentoAllureAdapter in codeception.yml file.
314

415
4.2.1
516
---------

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": "4.2.1",
5+
"version": "4.3.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,15 +267,12 @@ public function attachExceptionToAllure($exception, $testMethod)
267267

268268
AllureHelper::addAttachmentToCurrentStep($exception, $context . 'Exception');
269269

270-
//pop suppressed exceptions and attach to allure
271-
$change = function () {
272-
if ($this instanceof \PHPUnit\Framework\ExceptionWrapper) {
273-
return $this->previous;
274-
} else {
275-
return $this->getPrevious();
276-
}
277-
};
278-
$previousException = $change->call($exception);
270+
$previousException = null;
271+
if ($exception instanceof \PHPUnit\Framework\ExceptionWrapper) {
272+
$previousException = $exception->getPreviousWrapped();
273+
} elseif ($exception instanceof \Throwable) {
274+
$previousException = $exception->getPrevious();
275+
}
279276

280277
if ($previousException !== null) {
281278
$this->attachExceptionToAllure($previousException, $testMethod);

0 commit comments

Comments
 (0)