Skip to content

Commit dd29a86

Browse files
committed
MQE-2669: Seprated a run:failed command to generate:failed and run:failed
- update tests
1 parent 1d57cc3 commit dd29a86

File tree

7 files changed

+14
-42
lines changed

7 files changed

+14
-42
lines changed

dev/tests/verification/Resources/ChildExtendedTestNoParent.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@ class ChildExtendedTestNoParentCest
3131
*/
3232
public function ChildExtendedTestNoParent(AcceptanceTester $I, \Codeception\Scenario $scenario)
3333
{
34-
$scenario->skip("This test is skipped due to the following issues:No issues have been specified.");
35-
}
36-
37-
public function _passed(AcceptanceTester $I)
38-
{
39-
// Deleting itself so that we can rerun only failed tests.
4034
unlink(__FILE__);
35+
$scenario->skip("This test is skipped due to the following issues:No issues have been specified.");
4136
}
4237
}

dev/tests/verification/Resources/ExtendingSkippedTest.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,7 @@ class ExtendingSkippedTestCest
3030
*/
3131
public function ExtendingSkippedTest(AcceptanceTester $I, \Codeception\Scenario $scenario)
3232
{
33-
$scenario->skip("This test is skipped due to the following issues:\nParentTestIsSkipped");
34-
}
35-
36-
public function _passed(AcceptanceTester $I)
37-
{
38-
// Deleting itself so that we can rerun only failed tests.
3933
unlink(__FILE__);
34+
$scenario->skip("This test is skipped due to the following issues:\nParentTestIsSkipped");
4035
}
4136
}

dev/tests/verification/Resources/MergeSkip.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,7 @@ class MergeSkipCest
2626
*/
2727
public function MergeSkip(AcceptanceTester $I, \Codeception\Scenario $scenario)
2828
{
29-
$scenario->skip("This test is skipped due to the following issues:\nIssue5");
30-
}
31-
32-
public function _passed(AcceptanceTester $I)
33-
{
34-
// Deleting itself so that we can rerun only failed tests.
3529
unlink(__FILE__);
30+
$scenario->skip("This test is skipped due to the following issues:\nIssue5");
3631
}
3732
}

dev/tests/verification/Resources/SkippedTest.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@ class SkippedTestCest
2929
*/
3030
public function SkippedTest(AcceptanceTester $I, \Codeception\Scenario $scenario)
3131
{
32-
$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
33-
}
34-
35-
public function _passed(AcceptanceTester $I)
36-
{
37-
// Deleting itself so that we can rerun only failed tests.
3832
unlink(__FILE__);
33+
$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
3934
}
4035
}

dev/tests/verification/Resources/SkippedTestTwoIssues.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@ class SkippedTestTwoIssuesCest
2929
*/
3030
public function SkippedTestTwoIssues(AcceptanceTester $I, \Codeception\Scenario $scenario)
3131
{
32-
$scenario->skip("This test is skipped due to the following issues:\nSkippedValue\nSecondSkippedValue");
33-
}
34-
35-
public function _passed(AcceptanceTester $I)
36-
{
37-
// Deleting itself so that we can rerun only failed tests.
3832
unlink(__FILE__);
33+
$scenario->skip("This test is skipped due to the following issues:\nSkippedValue\nSecondSkippedValue");
3934
}
4035
}

dev/tests/verification/Resources/SkippedTestWithHooks.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,7 @@ class SkippedTestWithHooksCest
2929
*/
3030
public function SkippedTestWithHooks(AcceptanceTester $I, \Codeception\Scenario $scenario)
3131
{
32-
$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
33-
}
34-
35-
public function _passed(AcceptanceTester $I)
36-
{
37-
// Deleting itself so that we can rerun only failed tests.
3832
unlink(__FILE__);
33+
$scenario->skip("This test is skipped due to the following issues:\nSkippedValue");
3934
}
4035
}

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1812,12 +1812,14 @@ private function generateTestPhp($test)
18121812
$testPhp .= $steps;
18131813
$testPhp .= "\t}\n";
18141814

1815-
$testPhp .= PHP_EOL;
1816-
$testPhp .= sprintf("\tpublic function _passed(%s)\n", $dependencies);
1817-
$testPhp .= "\t{\n";
1818-
$testPhp .= "\t\t// Deleting itself so that we can rerun only failed tests." . PHP_EOL;
1819-
$testPhp .= "\t\tunlink(__FILE__);" . PHP_EOL;
1820-
$testPhp .= "\t}\n";
1815+
if (!isset($skipString)) {
1816+
$testPhp .= PHP_EOL;
1817+
$testPhp .= sprintf("\tpublic function _passed(%s)\n", $dependencies);
1818+
$testPhp .= "\t{\n";
1819+
$testPhp .= "\t\t// Deleting itself so that we can rerun only failed tests." . PHP_EOL;
1820+
$testPhp .= "\t\tunlink(__FILE__);" . PHP_EOL;
1821+
$testPhp .= "\t}\n";
1822+
}
18211823

18221824
return $testPhp;
18231825
}

0 commit comments

Comments
 (0)