Skip to content

Commit 4488b62

Browse files
okolesnykokolesnyk
authored
Merge pull request #138 from magento-commerce/develop
Preps for MFTF 3.7.2 release
2 parents e0d2190 + 929296d commit 4488b62

File tree

78 files changed

+1097
-140
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+1097
-140
lines changed

‎CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
3.7.2
4+
---------
5+
6+
### Bug fix:
7+
* Failed tests weren't logged correctly to `failed` file which caused a failure during run:failed command execution
8+
9+
310
3.7.1
411
---------
512

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.7.1",
5+
"version": "3.7.2",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {

‎composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717
*/
1818
class ActionGroupContainsStepKeyInArgTextCest
1919
{
20+
/**
21+
* @var bool
22+
*/
23+
private $isSuccess = false;
24+
2025
/**
2126
* @param AcceptanceTester $I
2227
* @throws \Exception
@@ -28,6 +33,17 @@ class ActionGroupContainsStepKeyInArgTextCest
2833
$I->comment("Exiting Action Group [actionGroup] actionGroupContainsStepKeyInArgValue");
2934
}
3035

36+
/**
37+
* @param AcceptanceTester $I
38+
* @throws \Exception
39+
*/
40+
public function _after(AcceptanceTester $I)
41+
{
42+
if ($this->isSuccess) {
43+
unlink(__FILE__);
44+
}
45+
}
46+
3147
/**
3248
* @Features({"TestModule"})
3349
* @Parameter(name = "AcceptanceTester", value="$I")
@@ -44,7 +60,7 @@ class ActionGroupContainsStepKeyInArgTextCest
4460

4561
public function _passed(AcceptanceTester $I)
4662
{
47-
// Deleting itself so that we can rerun only failed tests.
48-
unlink(__FILE__);
63+
// Test passed successfully.
64+
$this->isSuccess = true;
4965
}
5066
}

‎dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717
*/
1818
class ActionGroupMergedViaInsertAfterCest
1919
{
20+
/**
21+
* @var bool
22+
*/
23+
private $isSuccess = false;
24+
25+
/**
26+
* @param AcceptanceTester $I
27+
* @throws \Exception
28+
*/
29+
public function _after(AcceptanceTester $I)
30+
{
31+
if ($this->isSuccess) {
32+
unlink(__FILE__);
33+
}
34+
}
35+
2036
/**
2137
* @Features({"TestModule"})
2238
* @Parameter(name = "AcceptanceTester", value="$I")
@@ -38,7 +54,7 @@ class ActionGroupMergedViaInsertAfterCest
3854

3955
public function _passed(AcceptanceTester $I)
4056
{
41-
// Deleting itself so that we can rerun only failed tests.
42-
unlink(__FILE__);
57+
// Test passed successfully.
58+
$this->isSuccess = true;
4359
}
4460
}

‎dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717
*/
1818
class ActionGroupMergedViaInsertBeforeCest
1919
{
20+
/**
21+
* @var bool
22+
*/
23+
private $isSuccess = false;
24+
25+
/**
26+
* @param AcceptanceTester $I
27+
* @throws \Exception
28+
*/
29+
public function _after(AcceptanceTester $I)
30+
{
31+
if ($this->isSuccess) {
32+
unlink(__FILE__);
33+
}
34+
}
35+
2036
/**
2137
* @Features({"TestModule"})
2238
* @Parameter(name = "AcceptanceTester", value="$I")
@@ -38,7 +54,7 @@ class ActionGroupMergedViaInsertBeforeCest
3854

3955
public function _passed(AcceptanceTester $I)
4056
{
41-
// Deleting itself so that we can rerun only failed tests.
42-
unlink(__FILE__);
57+
// Test passed successfully.
58+
$this->isSuccess = true;
4359
}
4460
}

‎dev/tests/verification/Resources/ActionGroupReturningValueTest.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1818
*/
1919
class ActionGroupReturningValueTestCest
2020
{
21+
/**
22+
* @var bool
23+
*/
24+
private $isSuccess = false;
25+
2126
/**
2227
* @param AcceptanceTester $I
2328
* @throws \Exception
@@ -41,6 +46,9 @@ class ActionGroupReturningValueTestCest
4146
$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
4247
$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
4348
$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
49+
if ($this->isSuccess) {
50+
unlink(__FILE__);
51+
}
4452
}
4553

4654
/**
@@ -75,7 +83,7 @@ class ActionGroupReturningValueTestCest
7583

7684
public function _passed(AcceptanceTester $I)
7785
{
78-
// Deleting itself so that we can rerun only failed tests.
79-
unlink(__FILE__);
86+
// Test passed successfully.
87+
$this->isSuccess = true;
8088
}
8189
}

‎dev/tests/verification/Resources/ActionGroupToExtend.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717
*/
1818
class ActionGroupToExtendCest
1919
{
20+
/**
21+
* @var bool
22+
*/
23+
private $isSuccess = false;
24+
25+
/**
26+
* @param AcceptanceTester $I
27+
* @throws \Exception
28+
*/
29+
public function _after(AcceptanceTester $I)
30+
{
31+
if ($this->isSuccess) {
32+
unlink(__FILE__);
33+
}
34+
}
35+
2036
/**
2137
* @Features({"TestModule"})
2238
* @Parameter(name = "AcceptanceTester", value="$I")
@@ -34,7 +50,7 @@ class ActionGroupToExtendCest
3450

3551
public function _passed(AcceptanceTester $I)
3652
{
37-
// Deleting itself so that we can rerun only failed tests.
38-
unlink(__FILE__);
53+
// Test passed successfully.
54+
$this->isSuccess = true;
3955
}
4056
}

‎dev/tests/verification/Resources/ActionGroupUsingCreateData.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717
*/
1818
class ActionGroupUsingCreateDataCest
1919
{
20+
/**
21+
* @var bool
22+
*/
23+
private $isSuccess = false;
24+
2025
/**
2126
* @param AcceptanceTester $I
2227
* @throws \Exception
@@ -29,6 +34,17 @@ class ActionGroupUsingCreateDataCest
2934
$I->comment("Exiting Action Group [Key1] actionGroupWithCreateData");
3035
}
3136

37+
/**
38+
* @param AcceptanceTester $I
39+
* @throws \Exception
40+
*/
41+
public function _after(AcceptanceTester $I)
42+
{
43+
if ($this->isSuccess) {
44+
unlink(__FILE__);
45+
}
46+
}
47+
3248
/**
3349
* @Features({"TestModule"})
3450
* @Parameter(name = "AcceptanceTester", value="$I")
@@ -42,7 +58,7 @@ class ActionGroupUsingCreateDataCest
4258

4359
public function _passed(AcceptanceTester $I)
4460
{
45-
// Deleting itself so that we can rerun only failed tests.
46-
unlink(__FILE__);
61+
// Test passed successfully.
62+
$this->isSuccess = true;
4763
}
4864
}

‎dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1717
*/
1818
class ActionGroupUsingNestedArgumentCest
1919
{
20+
/**
21+
* @var bool
22+
*/
23+
private $isSuccess = false;
24+
25+
/**
26+
* @param AcceptanceTester $I
27+
* @throws \Exception
28+
*/
29+
public function _after(AcceptanceTester $I)
30+
{
31+
if ($this->isSuccess) {
32+
unlink(__FILE__);
33+
}
34+
}
35+
2036
/**
2137
* @Features({"TestModule"})
2238
* @Parameter(name = "AcceptanceTester", value="$I")
@@ -34,7 +50,7 @@ class ActionGroupUsingNestedArgumentCest
3450

3551
public function _passed(AcceptanceTester $I)
3652
{
37-
// Deleting itself so that we can rerun only failed tests.
38-
unlink(__FILE__);
53+
// Test passed successfully.
54+
$this->isSuccess = true;
3955
}
4056
}

‎dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1818
*/
1919
class ActionGroupWithDataOverrideTestCest
2020
{
21+
/**
22+
* @var bool
23+
*/
24+
private $isSuccess = false;
25+
2126
/**
2227
* @param AcceptanceTester $I
2328
* @throws \Exception
@@ -41,6 +46,9 @@ class ActionGroupWithDataOverrideTestCest
4146
$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
4247
$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
4348
$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
49+
if ($this->isSuccess) {
50+
unlink(__FILE__);
51+
}
4452
}
4553

4654
/**
@@ -76,7 +84,7 @@ class ActionGroupWithDataOverrideTestCest
7684

7785
public function _passed(AcceptanceTester $I)
7886
{
79-
// Deleting itself so that we can rerun only failed tests.
80-
unlink(__FILE__);
87+
// Test passed successfully.
88+
$this->isSuccess = true;
8189
}
8290
}

‎dev/tests/verification/Resources/ActionGroupWithDataTest.txt

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,11 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1818
*/
1919
class ActionGroupWithDataTestCest
2020
{
21+
/**
22+
* @var bool
23+
*/
24+
private $isSuccess = false;
25+
2126
/**
2227
* @param AcceptanceTester $I
2328
* @throws \Exception
@@ -41,6 +46,9 @@ class ActionGroupWithDataTestCest
4146
$I->fillField("#foo", "myData1"); // stepKey: fillField1AfterGroup
4247
$I->fillField("#bar", "myData2"); // stepKey: fillField2AfterGroup
4348
$I->comment("Exiting Action Group [afterGroup] FunctionalActionGroup");
49+
if ($this->isSuccess) {
50+
unlink(__FILE__);
51+
}
4452
}
4553

4654
/**
@@ -76,7 +84,7 @@ class ActionGroupWithDataTestCest
7684

7785
public function _passed(AcceptanceTester $I)
7886
{
79-
// Deleting itself so that we can rerun only failed tests.
80-
unlink(__FILE__);
87+
// Test passed successfully.
88+
$this->isSuccess = true;
8189
}
8290
}

‎dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,22 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1818
*/
1919
class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
2020
{
21+
/**
22+
* @var bool
23+
*/
24+
private $isSuccess = false;
25+
26+
/**
27+
* @param AcceptanceTester $I
28+
* @throws \Exception
29+
*/
30+
public function _after(AcceptanceTester $I)
31+
{
32+
if ($this->isSuccess) {
33+
unlink(__FILE__);
34+
}
35+
}
36+
2137
/**
2238
* @Severity(level = SeverityLevel::BLOCKER)
2339
* @Features({"TestModule"})
@@ -35,7 +51,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
3551

3652
public function _passed(AcceptanceTester $I)
3753
{
38-
// Deleting itself so that we can rerun only failed tests.
39-
unlink(__FILE__);
54+
// Test passed successfully.
55+
$this->isSuccess = true;
4056
}
4157
}

0 commit comments

Comments
 (0)