Merge branch 'develop' into ACQE-4318

Author: Keerthana81187

CHANGELOG.md

@@ -1,5 +1,16 @@
 Magento Functional Testing Framework Changelog
 ================================================
+4.3.0
+---------
+### Enhancements
+* Bumped `allure-framework/allure-codeception` dependency to `^2.1`.
+* Bumped `codeception/codeception` to `^5.0` and upgraded its dependent packages.
+* Replaced Yandex methods with Qameta related methods.
+* Created methods for modifying step name and for formatting allure.
+
+### Fixes
+* Fixed all issues and exceptions thrown after codeception upgrade.
+* Removed dependency of MagentoAllureAdapter in codeception.yml file.
 
 4.2.1
 ---------

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "4.2.1",
+    "version": "4.3.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -198,7 +198,7 @@ private function runMagentoWebDriverDoctor()
         unset($settings['modules']['config'][$magentoWebDriver]);
 
         $dispatcher = new EventDispatcher();
-        $suiteManager = new SuiteManager($dispatcher, self::SUITE, $settings);
+        $suiteManager = new SuiteManager($dispatcher, self::SUITE, $settings, []);
         try {
             $suiteManager->initialize();
             $this->context = ['Successful'];

src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php

@@ -267,15 +267,12 @@ public function attachExceptionToAllure($exception, $testMethod)
 
         AllureHelper::addAttachmentToCurrentStep($exception, $context . 'Exception');
 
-        //pop suppressed exceptions and attach to allure
-        $change = function () {
-            if ($this instanceof \PHPUnit\Framework\ExceptionWrapper) {
-                return $this->previous;
-            } else {
-                return $this->getPrevious();
-            }
-        };
-        $previousException = $change->call($exception);
+        $previousException = null;
+        if ($exception instanceof \PHPUnit\Framework\ExceptionWrapper) {
+            $previousException = $exception->getPreviousWrapped();
+        } elseif ($exception instanceof \Throwable) {
+            $previousException = $exception->getPrevious();
+        }
 
         if ($previousException !== null) {
             $this->attachExceptionToAllure($previousException, $testMethod);

src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php

@@ -91,8 +91,8 @@ private function connectToSeleniumServer()
                 $this->capabilities,
                 $this->connectionTimeoutInMs,
                 $this->requestTimeoutInMs,
-                $this->httpProxy,
-                $this->httpProxyPort
+                $this->config['http_proxy'],
+                $this->config['http_proxy_port']
             );
             if (null !== $this->remoteWebDriver) {
                 return;