Merge pull request #138 from magento-commerce/develop

Preps for MFTF 3.7.2 release

CHANGELOG.md

@@ -1,5 +1,12 @@
 Magento Functional Testing Framework Changelog
 ================================================
+3.7.2
+---------
+
+### Bug fix:
+* Failed tests weren't logged correctly to `failed` file which caused a failure during run:failed command execution
+
+
 3.7.1
 ---------
 

composer.json

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

dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt

@@ -17,6 +17,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupContainsStepKeyInArgTextCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
 	/**
 	  * @param AcceptanceTester $I
 	  * @throws \Exception
@@ -28,6 +33,17 @@ class ActionGroupContainsStepKeyInArgTextCest
 		$I->comment("Exiting Action Group [actionGroup] actionGroupContainsStepKeyInArgValue");
 	}
 
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
@@ -44,7 +60,7 @@ class ActionGroupContainsStepKeyInArgTextCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupMergedViaInsertAfterCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
@@ -38,7 +54,7 @@ class ActionGroupMergedViaInsertAfterCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupMergedViaInsertBeforeCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
@@ -38,7 +54,7 @@ class ActionGroupMergedViaInsertBeforeCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupReturningValueTest.txt

@@ -18,6 +18,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupReturningValueTestCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
 	/**
 	  * @param AcceptanceTester $I
 	  * @throws \Exception
@@ -41,6 +46,9 @@ class ActionGroupReturningValueTestCest
 		$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
 		$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
 		$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
 	}
 
 	/**
@@ -75,7 +83,7 @@ class ActionGroupReturningValueTestCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupToExtend.txt

@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupToExtendCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
@@ -34,7 +50,7 @@ class ActionGroupToExtendCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupUsingCreateData.txt

@@ -17,6 +17,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupUsingCreateDataCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
 	/**
 	  * @param AcceptanceTester $I
 	  * @throws \Exception
@@ -29,6 +34,17 @@ class ActionGroupUsingCreateDataCest
 		$I->comment("Exiting Action Group [Key1] actionGroupWithCreateData");
 	}
 
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
@@ -42,7 +58,7 @@ class ActionGroupUsingCreateDataCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt

@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupUsingNestedArgumentCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Features({"TestModule"})
 	 * @Parameter(name = "AcceptanceTester", value="$I")
@@ -34,7 +50,7 @@ class ActionGroupUsingNestedArgumentCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

@@ -18,6 +18,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupWithDataOverrideTestCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
 	/**
 	  * @param AcceptanceTester $I
 	  * @throws \Exception
@@ -41,6 +46,9 @@ class ActionGroupWithDataOverrideTestCest
 		$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
 		$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
 		$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
 	}
 
 	/**
@@ -76,7 +84,7 @@ class ActionGroupWithDataOverrideTestCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupWithDataTest.txt

@@ -18,6 +18,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupWithDataTestCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
 	/**
 	  * @param AcceptanceTester $I
 	  * @throws \Exception
@@ -41,6 +46,9 @@ class ActionGroupWithDataTestCest
 		$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
 		$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
 		$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
 	}
 
 	/**
@@ -76,7 +84,7 @@ class ActionGroupWithDataTestCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }

dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

@@ -18,6 +18,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
  */
 class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
 {
+	/**
+	 * @var bool
+	 */
+	private $isSuccess = false;
+
+	/**
+	  * @param AcceptanceTester $I
+	  * @throws \Exception
+	  */
+	public function _after(AcceptanceTester $I)
+	{
+		if ($this->isSuccess) {
+			unlink(__FILE__);
+		}
+	}
+
 	/**
 	 * @Severity(level = SeverityLevel::BLOCKER)
 	 * @Features({"TestModule"})
@@ -35,7 +51,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
 
 	public function _passed(AcceptanceTester $I)
 	{
-		// Deleting itself so that we can rerun only failed tests.
-		unlink(__FILE__);
+		// Test passed successfully.
+		$this->isSuccess = true;
 	}
 }