Merge pull request #202 from magento-gl/3.10.1-RC

3.10.1 rc

Author: jilu1

Diff for: CHANGELOG.md

@@ -1,6 +1,14 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+3.10.1
+---------
+
+### Fixes
+
+* Fixed allure reports not generating for composer builds.
+* Fixed all MFTF scheduled build not generating allure report.
+
 3.10.0
 ---------
 

Diff for: composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "3.10.0",
+    "version": "3.10.1",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
@@ -22,7 +22,7 @@
         "codeception/module-asserts": "^1.1",
         "codeception/module-sequence": "^1.0",
         "codeception/module-webdriver": "^1.0",
-        "composer/composer": "^1.9||^2.0",
+        "composer/composer": "^1.9 || ^2.0, !=2.2.16",
         "csharpru/vault-php": "^4.2.1",
         "guzzlehttp/guzzle": "^7.3.0",
         "laminas/laminas-diactoros": "^2.8",

Diff for: composer.lock

@@ -0,0 +1,39 @@
+<?php
+namespace Magento\AcceptanceTest\_default\Backend;
+
+use Magento\FunctionalTestingFramework\AcceptanceTester;
+use \Codeception\Util\Locator;
+use Yandex\Allure\Adapter\Annotation\Features;
+use Yandex\Allure\Adapter\Annotation\Stories;
+use Yandex\Allure\Adapter\Annotation\Title;
+use Yandex\Allure\Adapter\Annotation\Description;
+use Yandex\Allure\Adapter\Annotation\Parameter;
+use Yandex\Allure\Adapter\Annotation\Severity;
+use Yandex\Allure\Adapter\Model\SeverityLevel;
+use Yandex\Allure\Adapter\Annotation\TestCaseId;
+
+/**
+ * @Title("[NO TESTCASEID]: skippedTest")
+ * @Description("<h3>Test files</h3>verification/TestModule/Test/SkippedTest/SkippedTestWithIssueMustGetSkippedWithoutErrorExitCode.xml<br>")
+ */
+class SkippedTestWithIssueMustGetSkippedWithoutErrorExitCodeCest
+{
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
+	/**
+	 * @Stories({"skipped"})
+	 * @Severity(level = SeverityLevel::MINOR)
+	 * @Features({"TestModule"})
+	 * @param AcceptanceTester $I
+	 * @return void
+	 * @throws \Exception
+	 */
+	public function SkippedTestWithIssueMustGetSkippedWithoutErrorExitCode(AcceptanceTester $I, \Codeception\Scenario $scenario)
+	{
+		unlink(__FILE__);
+		$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
+	}
+}

Diff for: dev/tests/verification/Resources/SkippedTestWithIssueMustGetSkippedWithoutErrorExitCode.txt

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="SkippedTestWithIssueMustGetSkippedWithoutErrorExitCode">
+        <annotations>
+            <stories value="skipped"/>
+            <title value="skippedTest"/>
+            <description value=""/>
+            <severity value="AVERAGE"/>
+            <skip>
+                <issueId value="SkippedValue"/>
+            </skip>
+        </annotations>
+        <before>
+            <createData entity="ReplacementPerson" stepKey="createPersonParam"/>
+            <actionGroup ref="FunctionalActionGroup" stepKey="beforeGroup"/>
+        </before>
+        <createData entity="DefaultPerson" stepKey="createPerson"/>
+        <actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroupWithPersistedData1">
+            <argument name="person" value="$createPerson$"/>
+        </actionGroup>
+        <after>
+            <actionGroup ref="FunctionalActionGroup" stepKey="afterGroup" after ="notFound"/>
+        </after>
+    </test>
+</tests>

Diff for: dev/tests/verification/TestModule/Test/SkippedTest/SkippedTestWithIssueMustGetSkippedWithoutErrorExitCode.xml

@@ -41,4 +41,15 @@ public function testMultipleSkippedIssuesGeneration()
     {
         $this->generateAndCompareTest('SkippedTestTwoIssues');
     }
+
+    /**
+     * Tests skipped test doesnt fail to generate when there is issue in test
+     *
+     * @throws \Exception
+     * @throws \Magento\FunctionalTestingFramework\Exceptions\TestReferenceException
+     */
+    public function testSkippedTestMustNotFailToGenerateWithErrorWhenThereIsIssueWithAnyOfTheStepsAsTheTestIsSkipped()
+    {
+        $this->generateAndCompareTest('SkippedTestWithIssueMustGetSkippedWithoutErrorExitCode');
+    }
 }

Diff for: dev/tests/verification/Tests/SkippedGenerationTest.php

@@ -564,11 +564,13 @@ public function requiredCredentials($testObject)
     private function generateClassAnnotations($annotationType, $annotationName, $testObject)
     {
         $annotationToAppend = null;
-        $requiredCredentialsMessage = $this->requiredCredentials($testObject);
-        $credMsg = "\n\n"."This test uses the following credentials:"."\n";
-        if (!empty($requiredCredentialsMessage) && !empty($annotationName['main'])) {
-            $annotationName = ['main'=>$annotationName['main'].', '.$credMsg.''.$requiredCredentialsMessage,
-                'test_files'=> "\n".$annotationName['test_files'], 'deprecated'=>$annotationName['deprecated']];
+        if (!$testObject->isSkipped() && !empty($annotationName['main'])) {
+            $requiredCredentialsMessage = $this->requiredCredentials($testObject);
+            $credMsg = "\n\n"."This test uses the following credentials:"."\n";
+            $annotationName = (!empty($requiredCredentialsMessage)) ?
+                ['main'=>$annotationName['main'].', '.$credMsg.''.$requiredCredentialsMessage,
+                'test_files'=> "\n".$annotationName['test_files'], 'deprecated'=>$annotationName['deprecated']]
+                : $annotationName;
         }
         switch ($annotationType) {
             case "title":