Merge pull request #376 from magento/develop

MFTF 2.4.2 - Merge develop to master
magento · Jun 28, 2019 · ec1dd8f · ec1dd8f
2 parents a850051 + 4d55d3f
commit ec1dd8f
Show file tree

Hide file tree

Showing 97 changed files with 1,622 additions and 951 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,15 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.4.2
+-----
+* Traceability
+    * Test action `stepKey`s are now included in both console output and Allure report.
+    * XML Comments are now automatically converted into a `<comment>` action.
+
+### Fixes
+* Moved `epfremme/swagger-php` dependency to `suggests` block due to a conflict with Magento extensions.
+
 2.4.1
 -----
 * Traceability

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.4.1');
+    $application->setVersion('2.4.2');
     /** @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,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.4.1",
+    "version": "2.4.2",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -14,7 +14,6 @@
         "ext-curl": "*",
         "codeception/codeception": "~2.3.4 || ~2.4.0 ",
         "consolidation/robo": "^1.0.0",
-        "epfremme/swagger-php": "^2.0",
         "flow/jsonpath": ">0.2",
         "fzaninotto/faker": "^1.6",
         "monolog/monolog": "^1.0",
@@ -36,6 +35,9 @@
         "php-coveralls/php-coveralls": "^1.0",
         "symfony/stopwatch": "~3.4.6"
     },
+    "suggest": {
+        "epfremme/swagger-php": "^2.0"
+    },
     "autoload": {
         "files": ["src/Magento/FunctionalTestingFramework/_bootstrap.php"],
         "psr-4": {

diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml b/dev/tests/functional/tests/MFTF/DevDocs/Page/MFTFDocPage.xml
@@ -8,7 +8,7 @@
 
 <pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Page/etc/PageObject.xsd">
-    <page name="MFTFDocPage" url="guides/v2.2/magento-functional-testing-framework/release-2/introduction.html" area="storefront" module="MFTF_DevDocs">
+    <page name="MFTFDocPage" url="mftf/docs/introduction.html" area="storefront" module="MFTF_DevDocs">
         <section name="contentSection" />
     </page>
 </pages>
diff --git a/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml b/dev/tests/functional/tests/MFTF/DevDocs/Test/DevDocsTest.xml
@@ -10,6 +10,7 @@
         xsi:noNamespaceSchemaLocation="../../../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
     <test name="DevDocsTest">
         <annotations>
+            <!--   Comment in Annotations for DevDocs Test are not affecting test generation  -->
             <features value="DevDocs available"/>
             <stories value="MFTF DevDocs available"/>
             <title value="Magento Functional Testing Framework Documentation is available."/>
@@ -18,6 +19,7 @@
             <group value="mftf"/>
         </annotations>
 
+        <!--   Open MFTF DevDocs Page -->
         <amOnPage stepKey="openMFTFDevDocPage" url="{{MFTFDocPage.url}}" />
         <see stepKey="verifyPageIntroText" selector="{{contentSection.pageIntro}}" userInput="Introduction to the Magento Functional Testing Framework" />
     </test>