Merge pull request #299 from magento/MasterToDevelop-2.3.12

Master to develop 2.3.12
magento · Jan 22, 2019 · 680d9b9 · 680d9b9
2 parents 727c9c4 + b0f2a13
commit 680d9b9
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 Magento Functional Testing Framework Changelog
 ================================================
+2.3.12
+-----
+### Enhancements
+* Fetched latest allure-codeception package
 
 2.3.11
 -----

diff --git a/bin/mftf b/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.11');
+    $application->setVersion('2.3.12');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

diff --git a/composer.json b/composer.json
@@ -2,16 +2,16 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.3.11",
+    "version": "2.3.12",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
         "sort-packages": true
     },
     "require": {
         "php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
+        "allure-framework/allure-codeception": "~1.3.0",
         "ext-curl": "*",
-        "allure-framework/allure-codeception": "~1.2.6",
         "codeception/codeception": "~2.3.4",
         "consolidation/robo": "^1.0.0",
         "epfremme/swagger-php": "^2.0",

diff --git a/composer.lock b/composer.lock
diff --git a/etc/config/codeception.dist.yml b/etc/config/codeception.dist.yml
@@ -15,7 +15,7 @@ extensions:
         - Magento\FunctionalTestingFramework\Extension\TestContextExtension
         - Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter
     config:
-        Yandex\Allure\Adapter\AllureAdapter:
+        Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter:
             deletePreviousResults: true
             outputDirectory: allure-results
             ignoredAnnotations:

diff --git a/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php b/src/Magento/FunctionalTestingFramework/Allure/Adapter/MagentoAllureAdapter.php
@@ -6,7 +6,7 @@
 namespace Magento\FunctionalTestingFramework\Allure\Adapter;
 
 use Magento\FunctionalTestingFramework\Suite\Handlers\SuiteObjectHandler;
-use Yandex\Allure\Adapter\AllureAdapter;
+use Yandex\Allure\Codeception\AllureCodeception;
 use Yandex\Allure\Adapter\Event\StepStartedEvent;
 use Yandex\Allure\Adapter\Event\StepFinishedEvent;
 use Yandex\Allure\Adapter\Event\StepFailedEvent;
@@ -23,7 +23,7 @@
  * @package Magento\FunctionalTestingFramework\Allure
  */
 
-class MagentoAllureAdapter extends AllureAdapter
+class MagentoAllureAdapter extends AllureCodeception
 {
     /**
      * Array of group values passed to test runner command