Skip to content

Commit 4b4214e

Browse files
authored
Merge pull request #300 from magento-gl/4.3.1-release
Release Checklist :MFTF 4.3.1 release
2 parents b150619 + 5dbb60f commit 4b4214e

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
4+
4.3.1
5+
---------
6+
### Fixes
7+
* Fixed cannot bind closure to scope of internal class Exception.
8+
* Fixed broken Mftf doctor command.
9+
310
4.3.0
411
---------
512
### Enhancements

composer.json

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

composer.lock

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ private function runMagentoWebDriverDoctor()
198198
unset($settings['modules']['config'][$magentoWebDriver]);
199199

200200
$dispatcher = new EventDispatcher();
201-
$suiteManager = new SuiteManager($dispatcher, self::SUITE, $settings);
201+
$suiteManager = new SuiteManager($dispatcher, self::SUITE, $settings, []);
202202
try {
203203
$suiteManager->initialize();
204204
$this->context = ['Successful'];

src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php

+6-9
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);

src/Magento/FunctionalTestingFramework/Module/MagentoWebDriverDoctor.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ private function connectToSeleniumServer()
9191
$this->capabilities,
9292
$this->connectionTimeoutInMs,
9393
$this->requestTimeoutInMs,
94-
$this->httpProxy,
95-
$this->httpProxyPort
94+
$this->config['http_proxy'],
95+
$this->config['http_proxy_port']
9696
);
9797
if (null !== $this->remoteWebDriver) {
9898
return;

0 commit comments

Comments
 (0)