Merge pull request #200 from magento/develop

MFTF 2.3.4 Merge develop to master

Author: KevinBKozan

CHANGELOG.md

@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.3.4
+-----
+### Fixes
+* MagentoWebDriver overrides `parent::_after()` function and remaps to `runAfter()`, necessary to solve compatibility issues in Codeception `2.3.x`.
+
 2.3.3
 -----
 ### Fixes

bin/mftf

@@ -29,7 +29,7 @@ try {
 try {
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
-    $application->setVersion('2.3.0');
+    $application->setVersion('2.3.4');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

composer.json

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

composer.lock

@@ -59,11 +59,12 @@ class functionalSuiteHooks extends \Codeception\GroupObject
                 $this->create = new DataPersistenceHandler($createThis, [], $createFields);
                 $this->create->createEntity();
                 $webDriver->see("John", msq("uniqueData") . "John");
-                
+
                 // reset configuration and close session
                 $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig();
                 $webDriver->webDriver->close();
                 $webDriver->webDriver = null;
+
             } catch (\Exception $exception) {
                 $this->preconditionFailure = $exception->getMessage();
             }
@@ -74,16 +75,37 @@ class functionalSuiteHooks extends \Codeception\GroupObject
 
     public function _after(\Codeception\Event\TestEvent $e)
     {
-        $this->executePostConditions();
+        $this->executePostConditions($e);
     }
 
 
-    private function executePostConditions()
+    private function executePostConditions(\Codeception\Event\TestEvent $e)
     {
         if ($this->currentTestRun == $this->testCount) {
             print sprintf(self::$HOOK_EXECUTION_INIT, "after");
 
             try {
+                // Find out if Test in Suite failed, will cause potential failures in suite after
+                $cest = $e->getTest();
+
+                //Access private TestResultObject to find stack and if there are any errors (as opposed to failures)
+                $testResultObject = call_user_func(\Closure::bind(
+                    function () use ($cest) {
+                        return $cest->getTestResultObject();
+                    },
+                    $cest
+                ));
+                $errors = $testResultObject->errors();
+
+                if (!empty($errors)) {
+                    foreach ($errors as $error) {
+                        if ($error->failedTest()->getTestMethod() == $cest->getName()) {
+                            // Do not attempt to run _after if failure was in the _after block
+                            // Try to run _after but catch exceptions to prevent them from overwriting original failure.
+                            print("LAST TEST IN SUITE FAILED, TEST AFTER MAY NOT BE SUCCESSFUL\n");
+                        }
+                    }
+                }
                 $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver');
 
                 // close any open sessions
@@ -97,11 +119,6 @@ class functionalSuiteHooks extends \Codeception\GroupObject
                 $webDriver->amOnPage("some.url");
                 $webDriver->deleteEntityByUrl("deleteThis");
                 $webDriver->see("John", msq("uniqueData") . "John");
-                
-                // reset configuration and close session
-                $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig();
-                $webDriver->webDriver->close();
-                $webDriver->webDriver = null;
             } catch (\Exception $exception) {
                 print $exception->getMessage();
             }