Merge pull request #259 from magento-gl/4.0.1-RC

MFTF 4.0.0 Release checklist
magento · Jan 5, 2023 · daa28ec · daa28ec
2 parents 3403324 + a506a27
commit daa28ec
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+4.0.1
+---------
+### Fixes
+
+* Fixed HTML files and images not attached to allure report issue
+
 4.0.0
 ---------
 ### Enhancements

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "4.0.0",
+    "version": "4.0.1",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

diff --git a/composer.lock b/composer.lock
diff --git a/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php b/src/Magento/FunctionalTestingFramework/Module/MagentoWebDriver.php
@@ -30,6 +30,8 @@
 use Yandex\Allure\Adapter\Support\AttachmentSupport;
 use Magento\FunctionalTestingFramework\Exceptions\TestFrameworkException;
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use Yandex\Allure\Adapter\Allure as YandexAllure;
+use Yandex\Allure\Adapter\Event\AddAttachmentEvent;
 
 /**
  * MagentoWebDriver module provides common Magento web actions through Selenium WebDriver.
@@ -910,10 +912,10 @@ public function _failed(TestInterface $test, $fail)
         if ($this->current_test === null) {
             throw new \RuntimeException("Suite condition failure: \n" . $fail->getMessage());
         }
-
-        $this->addAttachment($this->pngReport, $test->getMetadata()->getName() . '.png', 'image/png');
-        $this->addAttachment($this->htmlReport, $test->getMetadata()->getName() . '.html', 'text/html');
-
+        YandexAllure::lifecycle()
+          ->fire(new AddAttachmentEvent($this->pngReport, $test->getMetadata()->getName() . '.png', 'image/png'));
+        YandexAllure::lifecycle()
+          ->fire(new AddAttachmentEvent($this->htmlReport, $test->getMetadata()->getName() . '.html', 'text/html'));
         $this->debug("Failure due to : {$fail->getMessage()}");
         $this->debug("Screenshot saved to {$this->pngReport}");
         $this->debug("Html saved to {$this->htmlReport}");