Skip to content

Commit baae0cb

Browse files
KevinBKozanKevinBKozan
committed
MQE-830: Output error details about test failure
- Verification test rollbacks to match output - static fixes
1 parent 9d1b07a commit baae0cb

32 files changed

+1
-162
lines changed

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -33,7 +32,6 @@ class ActionGroupWithDataOverrideTestCest
3332
*/
3433
public function _before(AcceptanceTester $I)
3534
{
36-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);
3735
$I->amGoingTo("create entity that has the stepKey: createPersonParam");
3836
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3937
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []);
@@ -48,7 +46,6 @@ class ActionGroupWithDataOverrideTestCest
4846
*/
4947
public function _after(AcceptanceTester $I)
5048
{
51-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);
5249
$I->fillField("#foo", "myData1");
5350
$I->fillField("#bar", "myData2");
5451
}
@@ -60,12 +57,6 @@ class ActionGroupWithDataOverrideTestCest
6057
public function _failed(AcceptanceTester $I)
6158
{
6259
$I->saveScreenshot();
63-
if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) {
64-
try {
65-
$this->_after($I);
66-
} catch (\Exception $failedException) {
67-
}
68-
}
6960
}
7061

7162
/**
@@ -79,7 +70,6 @@ class ActionGroupWithDataOverrideTestCest
7970
*/
8071
public function ActionGroupWithDataOverrideTest(AcceptanceTester $I)
8172
{
82-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
8373
$I->amOnPage("/someUrl");
8474
$I->amOnPage("/John/Doe.html");
8575
$I->fillField("#foo", "John");

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -33,7 +32,6 @@ class ActionGroupWithDataTestCest
3332
*/
3433
public function _before(AcceptanceTester $I)
3534
{
36-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);
3735
$I->amGoingTo("create entity that has the stepKey: createPersonParam");
3836
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3937
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []);
@@ -48,7 +46,6 @@ class ActionGroupWithDataTestCest
4846
*/
4947
public function _after(AcceptanceTester $I)
5048
{
51-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);
5249
$I->fillField("#foo", "myData1");
5350
$I->fillField("#bar", "myData2");
5451
}
@@ -60,12 +57,6 @@ class ActionGroupWithDataTestCest
6057
public function _failed(AcceptanceTester $I)
6158
{
6259
$I->saveScreenshot();
63-
if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) {
64-
try {
65-
$this->_after($I);
66-
} catch (\Exception $failedException) {
67-
}
68-
}
6960
}
7061

7162
/**
@@ -79,7 +70,6 @@ class ActionGroupWithDataTestCest
7970
*/
8071
public function ActionGroupWithDataTest(AcceptanceTester $I)
8172
{
82-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
8373
$I->amOnPage("/someUrl");
8474
$I->amOnPage("/Jane/Dane.html");
8575
$I->fillField("#foo", "Jane");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -30,7 +29,6 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest
3029
*/
3130
public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I)
3231
{
33-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
3432
$I->see("John", "#element .test1");
3533
}
3634
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -30,7 +29,6 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest
3029
*/
3130
public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I)
3231
{
33-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
3432
$I->see("Doe", "#John-Doe .test");
3533
}
3634
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -30,7 +29,6 @@ class ActionGroupWithNoArgumentsCest
3029
*/
3130
public function ActionGroupWithNoArguments(AcceptanceTester $I)
3231
{
33-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
3432
$I->wait(1);
3533
}
3634
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -33,7 +32,6 @@ class ActionGroupWithNoDefaultTestCest
3332
*/
3433
public function _before(AcceptanceTester $I)
3534
{
36-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);
3735
$I->amGoingTo("create entity that has the stepKey: createPersonParam");
3836
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3937
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []);
@@ -48,7 +46,6 @@ class ActionGroupWithNoDefaultTestCest
4846
*/
4947
public function _after(AcceptanceTester $I)
5048
{
51-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);
5249
$I->fillField("#foo", "myData1");
5350
$I->fillField("#bar", "myData2");
5451
}
@@ -60,12 +57,6 @@ class ActionGroupWithNoDefaultTestCest
6057
public function _failed(AcceptanceTester $I)
6158
{
6259
$I->saveScreenshot();
63-
if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) {
64-
try {
65-
$this->_after($I);
66-
} catch (\Exception $failedException) {
67-
}
68-
}
6960
}
7061

7162
/**
@@ -79,7 +70,6 @@ class ActionGroupWithNoDefaultTestCest
7970
*/
8071
public function ActionGroupWithNoDefaultTest(AcceptanceTester $I)
8172
{
82-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
8373
$I->amOnPage("/someUrl");
8474
$I->fillField("#foo", "Jane");
8575
$I->fillField("#bar", "Dane");

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -30,7 +29,6 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest
3029
*/
3130
public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I)
3231
{
33-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
3432
$I->see("John".msq("UniquePerson"), "#element .test1");
3533
}
3634
}

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -33,7 +32,6 @@ class ActionGroupWithPersistedDataCest
3332
*/
3433
public function _before(AcceptanceTester $I)
3534
{
36-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);
3735
$I->amGoingTo("create entity that has the stepKey: createPersonParam");
3836
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3937
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []);
@@ -48,7 +46,6 @@ class ActionGroupWithPersistedDataCest
4846
*/
4947
public function _after(AcceptanceTester $I)
5048
{
51-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);
5249
$I->fillField("#foo", "myData1");
5350
$I->fillField("#bar", "myData2");
5451
}
@@ -60,12 +57,6 @@ class ActionGroupWithPersistedDataCest
6057
public function _failed(AcceptanceTester $I)
6158
{
6259
$I->saveScreenshot();
63-
if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) {
64-
try {
65-
$this->_after($I);
66-
} catch (\Exception $failedException) {
67-
}
68-
}
6960
}
7061

7162
/**
@@ -79,7 +70,6 @@ class ActionGroupWithPersistedDataCest
7970
*/
8071
public function ActionGroupWithPersistedData(AcceptanceTester $I)
8172
{
82-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
8373
$I->amGoingTo("create entity that has the stepKey: createPerson");
8474
$DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson");
8575
$createPerson = new DataPersistenceHandler($DefaultPerson, []);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -30,7 +29,6 @@ class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest
3029
*/
3130
public function ActionGroupWithSimpleDataUsageFromDefaultArgument(AcceptanceTester $I)
3231
{
33-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
3432
$I->see("stringLiteral", "#element .stringLiteral");
3533
}
3634
}

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8-
use Magento\FunctionalTestingFramework\Extension\TestContextExtension;
98
use \Codeception\Util\Locator;
109
use Yandex\Allure\Adapter\Annotation\Features;
1110
use Yandex\Allure\Adapter\Annotation\Stories;
@@ -30,7 +29,6 @@ class ActionGroupWithSimpleDataUsageFromPassedArgumentCest
3029
*/
3130
public function ActionGroupWithSimpleDataUsageFromPassedArgument(AcceptanceTester $I)
3231
{
33-
TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);
3432
$I->see("overrideString", "#element .overrideString");
3533
$I->see("1", "#element .1");
3634
$I->see("1.5", "#element .1.5");

0 commit comments

Comments
 (0)