From 471aaafed3be0842de50d8c9af3da5622403191c Mon Sep 17 00:00:00 2001 From: KevinBKozan Date: Thu, 15 Mar 2018 13:04:26 -0500 Subject: [PATCH 1/4] MQE-830: Output error details about test failure - Introduces TestContextExtension, used to keep track of where in the test we are. - Changed generator to use this extension's capabilities, and to not rethrow exceptions in the _failed hook. - Verification tests will be failing, want to get design reviewed before spending time fixing them. --- .../Extension/TestContextExtension.php | 53 +++++++++++++++++++ .../Util/TestGenerator.php | 22 ++++++-- 2 files changed, 72 insertions(+), 3 deletions(-) create mode 100644 src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php diff --git a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php new file mode 100644 index 000000000..605a69ac4 --- /dev/null +++ b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php @@ -0,0 +1,53 @@ + 'beforeTest', + ]; + + const TEST_PHASE_BEFORE = "before"; + const TEST_PHASE_TEST = "test"; + const TEST_PHASE_AFTER = "after"; + + private static $testPhase; + + /** + * Codeception event listener function, triggered on activation of before hook. + * @param \Codeception\Event\TestEvent $e + */ + public function beforeTest(\Codeception\Event\TestEvent $e) + { + TestContextExtension::$testPhase = TestContextExtension::TEST_PHASE_BEFORE; + } + + /** + * Public setter for testPhase + * @param string $testPhase + */ + public static function setTestPhase(string $testPhase) + { + TestContextExtension::$testPhase = $testPhase; + } + + /** + * Getter for testPhase + * @return string + */ + public static function getTestPhase() + { + return TestContextExtension::$testPhase; + } + +} \ No newline at end of file diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php index affbbd36d..29f2696ac 100644 --- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php +++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php @@ -225,6 +225,7 @@ private function generateUseStatementsPhp() $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;\n"; $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;\n"; $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;\n"; + $useStatementsPhp .= "use Magento\FunctionalTestingFramework\Extension\TestContextExtension;\n"; $useStatementsPhp .= "use \Codeception\Util\Locator;\n"; $allureStatements = [ @@ -1407,10 +1408,24 @@ private function generateHooksPhp($hookObjects) throw new TestReferenceException($e->getMessage() . " in Element \"" . $type . "\""); } + $testPhaseSetter = ""; + + if ($hookObject->getType() == TestObjectExtractor::TEST_AFTER_HOOK) { + $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);\n"; + } else if ($hookObject->getType() == TestObjectExtractor::TEST_BEFORE_HOOK) { + $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);\n"; + } + + $steps = $testPhaseSetter . $steps; + if ($hookObject->getType() == TestObjectExtractor::TEST_FAILED_HOOK) { - $steps.="\t\t"; - $steps.='$this->_after($I);'; - $steps.="\n"; + $failedHook ="\t\t" . 'if (TestContextExtension::getTestPhase() !== TestContextExtension::TEST_PHASE_AFTER) {' . "\n"; + $failedHook.="\t\t\t" . 'try {' . "\n"; + $failedHook.="\t\t\t\t" . '$this->_after($I);' . "\n"; + $failedHook.="\t\t\t" . '} catch (\Exception $failedException) {' . "\n"; + $failedHook.="\t\t\t" . '}' . "\n"; + $failedHook.="\t\t" . '}' . "\n"; + $steps = $steps . $failedHook; } $hooks .= sprintf("\tpublic function _{$type}(%s)\n", $dependencies); @@ -1448,6 +1463,7 @@ private function generateTestPhp($test) $testPhp .= $testAnnotations; $testPhp .= sprintf("\tpublic function %s(%s)\n", $testName, $dependencies); $testPhp .= "\t{\n"; + $testPhp .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);\n"; $testPhp .= $steps; $testPhp .= "\t}\n"; From 170af1f904451b070414aad8e6907f4863a9c8ce Mon Sep 17 00:00:00 2001 From: KevinBKozan Date: Tue, 20 Mar 2018 09:17:13 -0500 Subject: [PATCH 2/4] MQE-830: Output error details about test failure - Test Fixes, generator fixes --- .../ActionGroupWithDataOverrideTest.txt | 11 ++++++++- .../Resources/ActionGroupWithDataTest.txt | 11 ++++++++- ...hDefaultArgumentAndStringSelectorParam.txt | 2 ++ ...eParameterSelectorsFromDefaultArgument.txt | 2 ++ .../Resources/ActionGroupWithNoArguments.txt | 2 ++ .../ActionGroupWithNoDefaultTest.txt | 11 ++++++++- ...thPassedArgumentAndStringSelectorParam.txt | 2 ++ .../ActionGroupWithPersistedData.txt | 11 ++++++++- ...WithSimpleDataUsageFromDefaultArgument.txt | 2 ++ ...pWithSimpleDataUsageFromPassedArgument.txt | 2 ++ ...leParameterSelectorFromDefaultArgument.txt | 2 ++ ...gleParameterSelectorFromPassedArgument.txt | 2 ++ .../ActionGroupWithStepKeyReferences.txt | 2 ++ .../ActionGroupWithTopLevelPersistedData.txt | 11 ++++++++- .../ArgumentWithSameNameAsElement.txt | 11 ++++++++- .../verification/Resources/AssertTest.txt | 3 +++ .../Resources/BasicActionGroupTest.txt | 3 +++ .../Resources/BasicFunctionalTest.txt | 11 ++++++++- .../verification/Resources/BasicMergeTest.txt | 11 ++++++++- .../Resources/CharacterReplacementTest.txt | 2 ++ .../Resources/DataReplacementTest.txt | 2 ++ .../Resources/HookActionsTest.txt | 11 ++++++++- .../Resources/LocatorFunctionTest.txt | 2 ++ .../Resources/MergedActionGroupTest.txt | 11 ++++++++- .../Resources/MergedReferencesTest.txt | 11 ++++++++- .../Resources/MultipleActionGroupsTest.txt | 11 ++++++++- .../Resources/PageReplacementTest.txt | 2 ++ .../Resources/ParameterArrayTest.txt | 2 ++ .../Resources/PersistedReplacementTest.txt | 3 +++ .../Resources/PersistenceCustomFieldsTest.txt | 3 +++ .../Resources/SectionReplacementTest.txt | 2 ++ .../Extension/TestContextExtension.php | 23 +++++++++++++------ .../Util/TestGenerator.php | 22 ++++++++++-------- 33 files changed, 191 insertions(+), 28 deletions(-) diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt index b46508433..b203c8919 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class ActionGroupWithDataOverrideTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class ActionGroupWithDataOverrideTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class ActionGroupWithDataOverrideTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class ActionGroupWithDataOverrideTestCest */ public function ActionGroupWithDataOverrideTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->amOnPage("/John/Doe.html"); $I->fillField("#foo", "John"); diff --git a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt index ec74168b8..bd9ee2961 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class ActionGroupWithDataTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class ActionGroupWithDataTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class ActionGroupWithDataTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class ActionGroupWithDataTestCest */ public function ActionGroupWithDataTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->amOnPage("/Jane/Dane.html"); $I->fillField("#foo", "Jane"); diff --git a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt index de83088a1..b595f7cfa 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest */ public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("John", "#element .test1"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt index d1457b121..4b4b43def 100644 --- a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest */ public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("Doe", "#John-Doe .test"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt b/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt index 591241f09..a5de67d25 100644 --- a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt +++ b/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithNoArgumentsCest */ public function ActionGroupWithNoArguments(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->wait(1); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt index 0c022f825..deabb5b3d 100644 --- a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class ActionGroupWithNoDefaultTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class ActionGroupWithNoDefaultTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class ActionGroupWithNoDefaultTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class ActionGroupWithNoDefaultTestCest */ public function ActionGroupWithNoDefaultTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->fillField("#foo", "Jane"); $I->fillField("#bar", "Dane"); diff --git a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt index b3a6cc89f..f41980dbe 100644 --- a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt +++ b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest */ public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("John".msq("UniquePerson"), "#element .test1"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt index 2a15e8394..dbcaf6e97 100644 --- a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt +++ b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class ActionGroupWithPersistedDataCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class ActionGroupWithPersistedDataCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class ActionGroupWithPersistedDataCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class ActionGroupWithPersistedDataCest */ public function ActionGroupWithPersistedData(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createPerson"); $DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson"); $createPerson = new DataPersistenceHandler($DefaultPerson, []); diff --git a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt index 37c9977ed..252d4b751 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest */ public function ActionGroupWithSimpleDataUsageFromDefaultArgument(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("stringLiteral", "#element .stringLiteral"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt index 9e385f72b..116a575a4 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithSimpleDataUsageFromPassedArgumentCest */ public function ActionGroupWithSimpleDataUsageFromPassedArgument(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("overrideString", "#element .overrideString"); $I->see("1", "#element .1"); $I->see("1.5", "#element .1.5"); diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt index 6fbf041b6..0da5e3541 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest */ public function ActionGroupWithSingleParameterSelectorFromDefaultArgument(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("Doe", "#element .John"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt index b74fb7179..d5e684c92 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,6 +30,7 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest */ public function ActionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("Doe", "#element .John".msq("UniquePerson")); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt b/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt index 8a56a6906..3ac4c9f05 100644 --- a/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt +++ b/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class ActionGroupWithStepKeyReferencesCest */ public function ActionGroupWithStepKeyReferences(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createSimpleDataActionGroup"); $simpleData = DataObjectHandler::getInstance()->getObject("simpleData"); $createSimpleDataActionGroup = new DataPersistenceHandler($simpleData, []); diff --git a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt index aaa1378ca..909cdbcd1 100644 --- a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt +++ b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class ActionGroupWithTopLevelPersistedDataCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class ActionGroupWithTopLevelPersistedDataCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class ActionGroupWithTopLevelPersistedDataCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class ActionGroupWithTopLevelPersistedDataCest */ public function ActionGroupWithTopLevelPersistedData(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/" . $this->createPersonParam->getCreatedDataByName('firstname') . "/" . $this->createPersonParam->getCreatedDataByName('lastname') . ".html"); $I->fillField("#foo", $this->createPersonParam->getCreatedDataByName('firstname')); $I->fillField("#bar", $this->createPersonParam->getCreatedDataByName('lastname')); diff --git a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt index 05fddcfa3..c1c6e9096 100644 --- a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt +++ b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class ArgumentWithSameNameAsElementCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class ArgumentWithSameNameAsElementCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class ArgumentWithSameNameAsElementCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class ArgumentWithSameNameAsElementCest */ public function ArgumentWithSameNameAsElement(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->seeElement("#element"); $I->seeElement("#element .John"); } diff --git a/dev/tests/verification/Resources/AssertTest.txt b/dev/tests/verification/Resources/AssertTest.txt index c34065533..6b7e1b91f 100644 --- a/dev/tests/verification/Resources/AssertTest.txt +++ b/dev/tests/verification/Resources/AssertTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,6 +31,7 @@ class AssertTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createData1"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createData1 = new DataPersistenceHandler($ReplacementPerson, []); @@ -44,6 +46,7 @@ class AssertTestCest */ public function AssertTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createData2"); $UniquePerson = DataObjectHandler::getInstance()->getObject("UniquePerson"); $createData2 = new DataPersistenceHandler($UniquePerson, []); diff --git a/dev/tests/verification/Resources/BasicActionGroupTest.txt b/dev/tests/verification/Resources/BasicActionGroupTest.txt index dae0f2aba..8546236a7 100644 --- a/dev/tests/verification/Resources/BasicActionGroupTest.txt +++ b/dev/tests/verification/Resources/BasicActionGroupTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class BasicActionGroupTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -51,6 +53,7 @@ class BasicActionGroupTestCest */ public function BasicActionGroupTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); diff --git a/dev/tests/verification/Resources/BasicFunctionalTest.txt b/dev/tests/verification/Resources/BasicFunctionalTest.txt index 9d4a0a3dd..4c9f326e8 100644 --- a/dev/tests/verification/Resources/BasicFunctionalTest.txt +++ b/dev/tests/verification/Resources/BasicFunctionalTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class BasicFunctionalTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amOnPage("/beforeUrl"); } @@ -36,6 +38,7 @@ class BasicFunctionalTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amOnPage("/afterUrl"); } @@ -46,7 +49,12 @@ class BasicFunctionalTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -60,6 +68,7 @@ class BasicFunctionalTestCest */ public function BasicFunctionalTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $someVarDefinition = $I->grabValueFrom(); $I->acceptPopup(); $I->amOnPage("/test/url"); diff --git a/dev/tests/verification/Resources/BasicMergeTest.txt b/dev/tests/verification/Resources/BasicMergeTest.txt index 0b457be66..fd9b16b49 100644 --- a/dev/tests/verification/Resources/BasicMergeTest.txt +++ b/dev/tests/verification/Resources/BasicMergeTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,6 +29,7 @@ class BasicMergeTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amOnPage("/beforeUrl"); $I->see("#before2"); } @@ -38,6 +40,7 @@ class BasicMergeTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amOnPage("/afterUrl1"); } @@ -48,7 +51,12 @@ class BasicMergeTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -62,6 +70,7 @@ class BasicMergeTestCest */ public function BasicMergeTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/step1"); $I->click("#step2"); $I->fillField("#username", "step3"); diff --git a/dev/tests/verification/Resources/CharacterReplacementTest.txt b/dev/tests/verification/Resources/CharacterReplacementTest.txt index 18c3ed1f8..88427e37f 100644 --- a/dev/tests/verification/Resources/CharacterReplacementTest.txt +++ b/dev/tests/verification/Resources/CharacterReplacementTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class CharacterReplacementTestCest */ public function CharacterReplacementTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->click("#element"); $I->fillField("#element", "7700 West Parmer Lane"); $I->click("#element .abcdefghijklmnopqrstuvwxyz1234567890"); diff --git a/dev/tests/verification/Resources/DataReplacementTest.txt b/dev/tests/verification/Resources/DataReplacementTest.txt index f2cc79e27..80732d638 100644 --- a/dev/tests/verification/Resources/DataReplacementTest.txt +++ b/dev/tests/verification/Resources/DataReplacementTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class DataReplacementTestCest */ public function DataReplacementTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->fillField("#selector", "StringBefore John StringAfter"); $I->fillField("#John", "input"); $I->dragAndDrop("#John", "Doe"); diff --git a/dev/tests/verification/Resources/HookActionsTest.txt b/dev/tests/verification/Resources/HookActionsTest.txt index 0bcd95ca5..29d77cff6 100644 --- a/dev/tests/verification/Resources/HookActionsTest.txt +++ b/dev/tests/verification/Resources/HookActionsTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -35,6 +36,7 @@ class HookActionsTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: sampleCreateBefore"); $sampleCreatedEntity = DataObjectHandler::getInstance()->getObject("sampleCreatedEntity"); $this->sampleCreateBefore = new DataPersistenceHandler($sampleCreatedEntity, []); @@ -58,6 +60,7 @@ class HookActionsTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amGoingTo("create entity that has the stepKey: sampleCreateAfter"); $sampleCreatedEntity = DataObjectHandler::getInstance()->getObject("sampleCreatedEntity"); $this->sampleCreateAfter = new DataPersistenceHandler($sampleCreatedEntity, []); @@ -73,7 +76,12 @@ class HookActionsTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -84,5 +92,6 @@ class HookActionsTestCest */ public function HookActionsTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); } } diff --git a/dev/tests/verification/Resources/LocatorFunctionTest.txt b/dev/tests/verification/Resources/LocatorFunctionTest.txt index ff3afbb3e..389f363ad 100644 --- a/dev/tests/verification/Resources/LocatorFunctionTest.txt +++ b/dev/tests/verification/Resources/LocatorFunctionTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class LocatorFunctionTestCest */ public function LocatorFunctionTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: data"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $data = new DataPersistenceHandler($ReplacementPerson, []); diff --git a/dev/tests/verification/Resources/MergedActionGroupTest.txt b/dev/tests/verification/Resources/MergedActionGroupTest.txt index 01655eed4..6d38aa377 100644 --- a/dev/tests/verification/Resources/MergedActionGroupTest.txt +++ b/dev/tests/verification/Resources/MergedActionGroupTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class MergedActionGroupTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class MergedActionGroupTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class MergedActionGroupTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class MergedActionGroupTestCest */ public function MergedActionGroupTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("#element .Jane"); $I->see(".merge .Jane"); $I->click(".merge .Dane"); diff --git a/dev/tests/verification/Resources/MergedReferencesTest.txt b/dev/tests/verification/Resources/MergedReferencesTest.txt index 0774d06f1..2d41f7a44 100644 --- a/dev/tests/verification/Resources/MergedReferencesTest.txt +++ b/dev/tests/verification/Resources/MergedReferencesTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class MergedReferencesTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amOnPage("/beforeUrl"); } @@ -36,6 +38,7 @@ class MergedReferencesTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amOnPage("/afterUrl"); } @@ -46,7 +49,12 @@ class MergedReferencesTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -60,6 +68,7 @@ class MergedReferencesTestCest */ public function MergedReferencesTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->fillField("#merge", "merged"); $I->fillField("#newElement", "newField"); } diff --git a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt index 4272c72fe..99d267e87 100644 --- a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt +++ b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -32,6 +33,7 @@ class MultipleActionGroupsTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,6 +48,7 @@ class MultipleActionGroupsTestCest */ public function _after(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -57,7 +60,12 @@ class MultipleActionGroupsTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - $this->_after($I); + if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { + try { + $this->_after($I); + } catch (\Exception $failedException) { + } + } } /** @@ -71,6 +79,7 @@ class MultipleActionGroupsTestCest */ public function MultipleActionGroupsTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->amOnPage("/Jane/Dane.html"); $I->fillField("#foo", "Jane"); diff --git a/dev/tests/verification/Resources/PageReplacementTest.txt b/dev/tests/verification/Resources/PageReplacementTest.txt index ce83ac9a8..e3ae061be 100644 --- a/dev/tests/verification/Resources/PageReplacementTest.txt +++ b/dev/tests/verification/Resources/PageReplacementTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class PageReplacementTestCest */ public function PageReplacementTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: datakey"); $simpleData = DataObjectHandler::getInstance()->getObject("simpleData"); $datakey = new DataPersistenceHandler($simpleData, []); diff --git a/dev/tests/verification/Resources/ParameterArrayTest.txt b/dev/tests/verification/Resources/ParameterArrayTest.txt index 3bb986b10..75c689349 100644 --- a/dev/tests/verification/Resources/ParameterArrayTest.txt +++ b/dev/tests/verification/Resources/ParameterArrayTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class ParameterArrayTestCest */ public function ParameterArrayTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: simpleDataKey"); $simpleParamData = DataObjectHandler::getInstance()->getObject("simpleParamData"); $simpleDataKey = new DataPersistenceHandler($simpleParamData, []); diff --git a/dev/tests/verification/Resources/PersistedReplacementTest.txt b/dev/tests/verification/Resources/PersistedReplacementTest.txt index 81321e7ed..d443a6e24 100644 --- a/dev/tests/verification/Resources/PersistedReplacementTest.txt +++ b/dev/tests/verification/Resources/PersistedReplacementTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,6 +31,7 @@ class PersistedReplacementTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createData1"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createData1 = new DataPersistenceHandler($ReplacementPerson, []); @@ -44,6 +46,7 @@ class PersistedReplacementTestCest */ public function PersistedReplacementTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createdData"); $simpleData = DataObjectHandler::getInstance()->getObject("simpleData"); $createdData = new DataPersistenceHandler($simpleData, []); diff --git a/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt b/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt index f4d607c0b..20c8f4079 100644 --- a/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt +++ b/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -35,6 +36,7 @@ class PersistenceCustomFieldsTestCest */ public function _before(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $createData1Fields['firstname'] = "Mac"; $createData1Fields['lastname'] = "Doe"; $I->amGoingTo("create entity that has the stepKey: createData1"); @@ -56,6 +58,7 @@ class PersistenceCustomFieldsTestCest */ public function PersistenceCustomFieldsTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $createdDataFields['favoriteIndex'] = "1"; $createdDataFields['middlename'] = "Kovacs"; $I->amGoingTo("create entity that has the stepKey: createdData"); diff --git a/dev/tests/verification/Resources/SectionReplacementTest.txt b/dev/tests/verification/Resources/SectionReplacementTest.txt index 73b34fe30..8b9fb320c 100644 --- a/dev/tests/verification/Resources/SectionReplacementTest.txt +++ b/dev/tests/verification/Resources/SectionReplacementTest.txt @@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; +use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -27,6 +28,7 @@ class SectionReplacementTestCest */ public function SectionReplacementTest(AcceptanceTester $I) { + TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->click("#element"); $I->click("#foo"); $I->waitForPageLoad(30); diff --git a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php index 605a69ac4..cac4a9a4e 100644 --- a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php +++ b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php @@ -10,24 +10,33 @@ /** * Class TestContextExtension + * @SuppressWarnings(PHPMD.UnusedPrivateField) */ class TestContextExtension extends \Codeception\Extension { + /** + * Codeception Events Mapping to methods + * @var array + */ public static $events = [ Events::TEST_BEFORE => 'beforeTest', ]; + /** + * Static variable for keeping track of test phase. + * @var string + */ + private static $testPhase; + const TEST_PHASE_BEFORE = "before"; const TEST_PHASE_TEST = "test"; const TEST_PHASE_AFTER = "after"; - private static $testPhase; - /** - * Codeception event listener function, triggered on activation of before hook. - * @param \Codeception\Event\TestEvent $e + * Codeception event listener function, triggered on activation of test execution. + * @return void */ - public function beforeTest(\Codeception\Event\TestEvent $e) + public function beforeTest() { TestContextExtension::$testPhase = TestContextExtension::TEST_PHASE_BEFORE; } @@ -35,6 +44,7 @@ public function beforeTest(\Codeception\Event\TestEvent $e) /** * Public setter for testPhase * @param string $testPhase + * @return void */ public static function setTestPhase(string $testPhase) { @@ -49,5 +59,4 @@ public static function getTestPhase() { return TestContextExtension::$testPhase; } - -} \ No newline at end of file +} diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php index 29f2696ac..241ecefcf 100644 --- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php +++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php @@ -1367,6 +1367,7 @@ private function stripAndSplitReference($reference, $delimiter) * @return string * @throws TestReferenceException * @throws \Exception + * @SuppressWarnings(PHPMD.CyclomaticComplexity) */ private function generateHooksPhp($hookObjects) { @@ -1411,20 +1412,23 @@ private function generateHooksPhp($hookObjects) $testPhaseSetter = ""; if ($hookObject->getType() == TestObjectExtractor::TEST_AFTER_HOOK) { - $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);\n"; - } else if ($hookObject->getType() == TestObjectExtractor::TEST_BEFORE_HOOK) { - $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);\n"; + $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);"; + $testPhaseSetter .= "\n"; + } elseif ($hookObject->getType() == TestObjectExtractor::TEST_BEFORE_HOOK) { + $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);"; + $testPhaseSetter .= "\n"; } $steps = $testPhaseSetter . $steps; if ($hookObject->getType() == TestObjectExtractor::TEST_FAILED_HOOK) { - $failedHook ="\t\t" . 'if (TestContextExtension::getTestPhase() !== TestContextExtension::TEST_PHASE_AFTER) {' . "\n"; - $failedHook.="\t\t\t" . 'try {' . "\n"; - $failedHook.="\t\t\t\t" . '$this->_after($I);' . "\n"; - $failedHook.="\t\t\t" . '} catch (\Exception $failedException) {' . "\n"; - $failedHook.="\t\t\t" . '}' . "\n"; - $failedHook.="\t\t" . '}' . "\n"; + $failedHook = "\t\t" . 'if (TestContextExtension::getTestPhase() !=='; + $failedHook .= "TestContextExtension::TEST_PHASE_AFTER) {" . "\n"; + $failedHook .= "\t\t\t" . 'try {' . "\n"; + $failedHook .= "\t\t\t\t" . '$this->_after($I);' . "\n"; + $failedHook .= "\t\t\t" . '} catch (\Exception $failedException) {' . "\n"; + $failedHook .= "\t\t\t" . '}' . "\n"; + $failedHook .= "\t\t" . '}' . "\n"; $steps = $steps . $failedHook; } From 19ba88b0c773c9c80145a5d054a1213fad1018a4 Mon Sep 17 00:00:00 2001 From: KevinBKozan Date: Tue, 27 Mar 2018 08:29:59 -0500 Subject: [PATCH 3/4] MQE-830: Output error details about test failure - refactor to not constantly keep track of state - test context is now only found when a failure occurs, not set at generator --- .../Extension/TestContextExtension.php | 63 +++++++++++-------- .../Util/TestGenerator.php | 25 -------- 2 files changed, 36 insertions(+), 52 deletions(-) diff --git a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php index cac4a9a4e..5025b10cf 100644 --- a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php +++ b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php @@ -14,49 +14,58 @@ */ class TestContextExtension extends \Codeception\Extension { + const TEST_PHASE_AFTER = "_after"; + /** * Codeception Events Mapping to methods * @var array */ public static $events = [ - Events::TEST_BEFORE => 'beforeTest', + Events::TEST_FAIL => 'testFail', ]; /** - * Static variable for keeping track of test phase. - * @var string - */ - private static $testPhase; - - const TEST_PHASE_BEFORE = "before"; - const TEST_PHASE_TEST = "test"; - const TEST_PHASE_AFTER = "after"; - - /** - * Codeception event listener function, triggered on activation of test execution. - * @return void - */ - public function beforeTest() - { - TestContextExtension::$testPhase = TestContextExtension::TEST_PHASE_BEFORE; - } - - /** - * Public setter for testPhase - * @param string $testPhase + * Codeception event listener function, triggered on test failure. + * @param \Codeception\Event\FailEvent $e * @return void */ - public static function setTestPhase(string $testPhase) + public function testFail(\Codeception\Event\FailEvent $e) { - TestContextExtension::$testPhase = $testPhase; + $cest = $e->getTest(); + $context = $this->extractContext($e->getFail()->getTrace(), $cest->getTestMethod()); + // Do not attempt to run _after if failure was in the _after block + // Try to run _after but catch exceptions to prevent them from overwriting original failure. + if ($context != TestContextExtension::TEST_PHASE_AFTER) { + try { + $actorClass = $e->getTest()->getMetadata()->getCurrent('actor'); + $I = new $actorClass($cest->getScenario()); + call_user_func(\Closure::bind( + function () use ($cest, $I) { + $cest->executeHook($I, 'after'); + }, + null, + $cest + )); + } catch (\Exception $e) { + // Do not rethrow Exception + } + } } /** - * Getter for testPhase + * Extracts hook method from trace, looking specifically for the cest class given. + * @param array $trace + * @param string $class * @return string */ - public static function getTestPhase() + public function extractContext($trace, $class) { - return TestContextExtension::$testPhase; + foreach($trace as $entry) { + $traceClass = $entry["class"] ?? null; + if (strpos($traceClass, $class) != 0) { + return $entry["function"]; + } + } + return null; } } diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php index 241ecefcf..ec7de9f6c 100644 --- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php +++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php @@ -225,7 +225,6 @@ private function generateUseStatementsPhp() $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;\n"; $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;\n"; $useStatementsPhp .= "use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;\n"; - $useStatementsPhp .= "use Magento\FunctionalTestingFramework\Extension\TestContextExtension;\n"; $useStatementsPhp .= "use \Codeception\Util\Locator;\n"; $allureStatements = [ @@ -1409,29 +1408,6 @@ private function generateHooksPhp($hookObjects) throw new TestReferenceException($e->getMessage() . " in Element \"" . $type . "\""); } - $testPhaseSetter = ""; - - if ($hookObject->getType() == TestObjectExtractor::TEST_AFTER_HOOK) { - $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER);"; - $testPhaseSetter .= "\n"; - } elseif ($hookObject->getType() == TestObjectExtractor::TEST_BEFORE_HOOK) { - $testPhaseSetter .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE);"; - $testPhaseSetter .= "\n"; - } - - $steps = $testPhaseSetter . $steps; - - if ($hookObject->getType() == TestObjectExtractor::TEST_FAILED_HOOK) { - $failedHook = "\t\t" . 'if (TestContextExtension::getTestPhase() !=='; - $failedHook .= "TestContextExtension::TEST_PHASE_AFTER) {" . "\n"; - $failedHook .= "\t\t\t" . 'try {' . "\n"; - $failedHook .= "\t\t\t\t" . '$this->_after($I);' . "\n"; - $failedHook .= "\t\t\t" . '} catch (\Exception $failedException) {' . "\n"; - $failedHook .= "\t\t\t" . '}' . "\n"; - $failedHook .= "\t\t" . '}' . "\n"; - $steps = $steps . $failedHook; - } - $hooks .= sprintf("\tpublic function _{$type}(%s)\n", $dependencies); $hooks .= "\t{\n"; $hooks .= $steps; @@ -1467,7 +1443,6 @@ private function generateTestPhp($test) $testPhp .= $testAnnotations; $testPhp .= sprintf("\tpublic function %s(%s)\n", $testName, $dependencies); $testPhp .= "\t{\n"; - $testPhp .= "\t\tTestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST);\n"; $testPhp .= $steps; $testPhp .= "\t}\n"; From baae0cbbf4b0e1e973924e4fc3d5d901d1e15e83 Mon Sep 17 00:00:00 2001 From: KevinBKozan Date: Tue, 27 Mar 2018 08:40:33 -0500 Subject: [PATCH 4/4] MQE-830: Output error details about test failure - Verification test rollbacks to match output - static fixes --- .../Resources/ActionGroupWithDataOverrideTest.txt | 10 ---------- .../verification/Resources/ActionGroupWithDataTest.txt | 10 ---------- ...nGroupWithDefaultArgumentAndStringSelectorParam.txt | 2 -- ...thMultipleParameterSelectorsFromDefaultArgument.txt | 2 -- .../Resources/ActionGroupWithNoArguments.txt | 2 -- .../Resources/ActionGroupWithNoDefaultTest.txt | 10 ---------- ...onGroupWithPassedArgumentAndStringSelectorParam.txt | 2 -- .../Resources/ActionGroupWithPersistedData.txt | 10 ---------- ...tionGroupWithSimpleDataUsageFromDefaultArgument.txt | 2 -- ...ctionGroupWithSimpleDataUsageFromPassedArgument.txt | 2 -- ...pWithSingleParameterSelectorFromDefaultArgument.txt | 2 -- ...upWithSingleParameterSelectorFromPassedArgument.txt | 2 -- .../Resources/ActionGroupWithStepKeyReferences.txt | 2 -- .../Resources/ActionGroupWithTopLevelPersistedData.txt | 10 ---------- .../Resources/ArgumentWithSameNameAsElement.txt | 10 ---------- dev/tests/verification/Resources/AssertTest.txt | 3 --- .../verification/Resources/BasicActionGroupTest.txt | 3 --- .../verification/Resources/BasicFunctionalTest.txt | 9 --------- dev/tests/verification/Resources/BasicMergeTest.txt | 10 ---------- .../Resources/CharacterReplacementTest.txt | 2 -- .../verification/Resources/DataReplacementTest.txt | 2 -- dev/tests/verification/Resources/HookActionsTest.txt | 10 ---------- .../verification/Resources/LocatorFunctionTest.txt | 2 -- .../verification/Resources/MergedActionGroupTest.txt | 10 ---------- .../verification/Resources/MergedReferencesTest.txt | 10 ---------- .../Resources/MultipleActionGroupsTest.txt | 10 ---------- .../verification/Resources/PageReplacementTest.txt | 2 -- .../verification/Resources/ParameterArrayTest.txt | 2 -- .../Resources/PersistedReplacementTest.txt | 3 --- .../Resources/PersistenceCustomFieldsTest.txt | 3 --- .../verification/Resources/SectionReplacementTest.txt | 2 -- .../Extension/TestContextExtension.php | 2 +- 32 files changed, 1 insertion(+), 162 deletions(-) diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt index ce5fa0893..0809289b3 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class ActionGroupWithDataOverrideTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class ActionGroupWithDataOverrideTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class ActionGroupWithDataOverrideTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class ActionGroupWithDataOverrideTestCest */ public function ActionGroupWithDataOverrideTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->amOnPage("/John/Doe.html"); $I->fillField("#foo", "John"); diff --git a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt index 65f5f6acd..fe3cf57c1 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDataTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class ActionGroupWithDataTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class ActionGroupWithDataTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class ActionGroupWithDataTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class ActionGroupWithDataTestCest */ public function ActionGroupWithDataTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->amOnPage("/Jane/Dane.html"); $I->fillField("#foo", "Jane"); diff --git a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt index c7e2c84d9..9c56afff4 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest */ public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("John", "#element .test1"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt index 315365983..aa213c80f 100644 --- a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest */ public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("Doe", "#John-Doe .test"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt b/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt index 90a427ad3..45807663a 100644 --- a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt +++ b/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithNoArgumentsCest */ public function ActionGroupWithNoArguments(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->wait(1); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt index 3db4096e7..5cc1d7f39 100644 --- a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class ActionGroupWithNoDefaultTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class ActionGroupWithNoDefaultTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class ActionGroupWithNoDefaultTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class ActionGroupWithNoDefaultTestCest */ public function ActionGroupWithNoDefaultTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->fillField("#foo", "Jane"); $I->fillField("#bar", "Dane"); diff --git a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt index 5847b5b7b..c16a6a26e 100644 --- a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt +++ b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest */ public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("John".msq("UniquePerson"), "#element .test1"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt index 651f5180d..2707770d5 100644 --- a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt +++ b/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class ActionGroupWithPersistedDataCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class ActionGroupWithPersistedDataCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class ActionGroupWithPersistedDataCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class ActionGroupWithPersistedDataCest */ public function ActionGroupWithPersistedData(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createPerson"); $DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson"); $createPerson = new DataPersistenceHandler($DefaultPerson, []); diff --git a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt index c915d5a71..3774e639d 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest */ public function ActionGroupWithSimpleDataUsageFromDefaultArgument(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("stringLiteral", "#element .stringLiteral"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt index f032a637f..a1e5a316b 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithSimpleDataUsageFromPassedArgumentCest */ public function ActionGroupWithSimpleDataUsageFromPassedArgument(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("overrideString", "#element .overrideString"); $I->see("1", "#element .1"); $I->see("1.5", "#element .1.5"); diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt index 548f33907..d04e2ba80 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest */ public function ActionGroupWithSingleParameterSelectorFromDefaultArgument(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("Doe", "#element .John"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt index c8fc12278..98c561e3c 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -30,7 +29,6 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest */ public function ActionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("Doe", "#element .John".msq("UniquePerson")); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt b/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt index e9579cef7..ac97746b8 100644 --- a/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt +++ b/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class ActionGroupWithStepKeyReferencesCest */ public function ActionGroupWithStepKeyReferences(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createSimpleDataActionGroup"); $simpleData = DataObjectHandler::getInstance()->getObject("simpleData"); $createSimpleDataActionGroup = new DataPersistenceHandler($simpleData, []); diff --git a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt index acfdcb57e..743864b79 100644 --- a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt +++ b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class ActionGroupWithTopLevelPersistedDataCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class ActionGroupWithTopLevelPersistedDataCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class ActionGroupWithTopLevelPersistedDataCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class ActionGroupWithTopLevelPersistedDataCest */ public function ActionGroupWithTopLevelPersistedData(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/" . $this->createPersonParam->getCreatedDataByName('firstname') . "/" . $this->createPersonParam->getCreatedDataByName('lastname') . ".html"); $I->fillField("#foo", $this->createPersonParam->getCreatedDataByName('firstname')); $I->fillField("#bar", $this->createPersonParam->getCreatedDataByName('lastname')); diff --git a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt index 931b9a29e..bb59a6758 100644 --- a/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt +++ b/dev/tests/verification/Resources/ArgumentWithSameNameAsElement.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class ArgumentWithSameNameAsElementCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class ArgumentWithSameNameAsElementCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class ArgumentWithSameNameAsElementCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class ArgumentWithSameNameAsElementCest */ public function ArgumentWithSameNameAsElement(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->seeElement("#element"); $I->seeElement("#element .John"); } diff --git a/dev/tests/verification/Resources/AssertTest.txt b/dev/tests/verification/Resources/AssertTest.txt index ac0d42ac5..60eed6a8d 100644 --- a/dev/tests/verification/Resources/AssertTest.txt +++ b/dev/tests/verification/Resources/AssertTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -31,7 +30,6 @@ class AssertTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createData1"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createData1 = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,7 +44,6 @@ class AssertTestCest */ public function AssertTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createData2"); $UniquePerson = DataObjectHandler::getInstance()->getObject("UniquePerson"); $createData2 = new DataPersistenceHandler($UniquePerson, []); diff --git a/dev/tests/verification/Resources/BasicActionGroupTest.txt b/dev/tests/verification/Resources/BasicActionGroupTest.txt index 95a472f8a..86835364e 100644 --- a/dev/tests/verification/Resources/BasicActionGroupTest.txt +++ b/dev/tests/verification/Resources/BasicActionGroupTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class BasicActionGroupTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -53,7 +51,6 @@ class BasicActionGroupTestCest */ public function BasicActionGroupTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); diff --git a/dev/tests/verification/Resources/BasicFunctionalTest.txt b/dev/tests/verification/Resources/BasicFunctionalTest.txt index b20a9d4fd..289a62e3f 100644 --- a/dev/tests/verification/Resources/BasicFunctionalTest.txt +++ b/dev/tests/verification/Resources/BasicFunctionalTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class BasicFunctionalTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amOnPage("/beforeUrl"); } @@ -38,7 +36,6 @@ class BasicFunctionalTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amOnPage("/afterUrl"); } @@ -49,12 +46,6 @@ class BasicFunctionalTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** diff --git a/dev/tests/verification/Resources/BasicMergeTest.txt b/dev/tests/verification/Resources/BasicMergeTest.txt index aea5f9212..2cecb803f 100644 --- a/dev/tests/verification/Resources/BasicMergeTest.txt +++ b/dev/tests/verification/Resources/BasicMergeTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -29,7 +28,6 @@ class BasicMergeTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amOnPage("/beforeUrl"); $I->see("#before2"); } @@ -40,7 +38,6 @@ class BasicMergeTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amOnPage("/afterUrl1"); } @@ -51,12 +48,6 @@ class BasicMergeTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -70,7 +61,6 @@ class BasicMergeTestCest */ public function BasicMergeTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/step1"); $I->click("#step2"); $I->fillField("#username", "step3"); diff --git a/dev/tests/verification/Resources/CharacterReplacementTest.txt b/dev/tests/verification/Resources/CharacterReplacementTest.txt index 83a74aaf4..4ae325fba 100644 --- a/dev/tests/verification/Resources/CharacterReplacementTest.txt +++ b/dev/tests/verification/Resources/CharacterReplacementTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class CharacterReplacementTestCest */ public function CharacterReplacementTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->click("#element"); $I->fillField("#element", "7700 West Parmer Lane"); $I->click("#element .abcdefghijklmnopqrstuvwxyz1234567890"); diff --git a/dev/tests/verification/Resources/DataReplacementTest.txt b/dev/tests/verification/Resources/DataReplacementTest.txt index b08501913..a6d620a2c 100644 --- a/dev/tests/verification/Resources/DataReplacementTest.txt +++ b/dev/tests/verification/Resources/DataReplacementTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class DataReplacementTestCest */ public function DataReplacementTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->fillField("#selector", "StringBefore John StringAfter"); $I->fillField("#John", "input"); $I->dragAndDrop("#John", "Doe"); diff --git a/dev/tests/verification/Resources/HookActionsTest.txt b/dev/tests/verification/Resources/HookActionsTest.txt index de3a69a84..2e9eb609b 100644 --- a/dev/tests/verification/Resources/HookActionsTest.txt +++ b/dev/tests/verification/Resources/HookActionsTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -36,7 +35,6 @@ class HookActionsTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: sampleCreateBefore"); $sampleCreatedEntity = DataObjectHandler::getInstance()->getObject("sampleCreatedEntity"); $this->sampleCreateBefore = new DataPersistenceHandler($sampleCreatedEntity, []); @@ -60,7 +58,6 @@ class HookActionsTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amGoingTo("create entity that has the stepKey: sampleCreateAfter"); $sampleCreatedEntity = DataObjectHandler::getInstance()->getObject("sampleCreatedEntity"); $this->sampleCreateAfter = new DataPersistenceHandler($sampleCreatedEntity, []); @@ -76,12 +73,6 @@ class HookActionsTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -92,6 +83,5 @@ class HookActionsTestCest */ public function HookActionsTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); } } diff --git a/dev/tests/verification/Resources/LocatorFunctionTest.txt b/dev/tests/verification/Resources/LocatorFunctionTest.txt index 09014c0e8..37e5ae9fb 100644 --- a/dev/tests/verification/Resources/LocatorFunctionTest.txt +++ b/dev/tests/verification/Resources/LocatorFunctionTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class LocatorFunctionTestCest */ public function LocatorFunctionTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: data"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $data = new DataPersistenceHandler($ReplacementPerson, []); diff --git a/dev/tests/verification/Resources/MergedActionGroupTest.txt b/dev/tests/verification/Resources/MergedActionGroupTest.txt index b15c5b9d9..ab9b46f8d 100644 --- a/dev/tests/verification/Resources/MergedActionGroupTest.txt +++ b/dev/tests/verification/Resources/MergedActionGroupTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class MergedActionGroupTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class MergedActionGroupTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class MergedActionGroupTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class MergedActionGroupTestCest */ public function MergedActionGroupTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->see("#element .Jane"); $I->see(".merge .Jane"); $I->click(".merge .Dane"); diff --git a/dev/tests/verification/Resources/MergedReferencesTest.txt b/dev/tests/verification/Resources/MergedReferencesTest.txt index e8b41c5a4..519db4314 100644 --- a/dev/tests/verification/Resources/MergedReferencesTest.txt +++ b/dev/tests/verification/Resources/MergedReferencesTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class MergedReferencesTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amOnPage("/beforeUrl"); } @@ -38,7 +36,6 @@ class MergedReferencesTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->amOnPage("/afterUrl"); } @@ -49,12 +46,6 @@ class MergedReferencesTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -68,7 +59,6 @@ class MergedReferencesTestCest */ public function MergedReferencesTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->fillField("#merge", "merged"); $I->fillField("#newElement", "newField"); } diff --git a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt index 16cb7e79c..d9b32bfce 100644 --- a/dev/tests/verification/Resources/MultipleActionGroupsTest.txt +++ b/dev/tests/verification/Resources/MultipleActionGroupsTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -33,7 +32,6 @@ class MultipleActionGroupsTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createPersonParam"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createPersonParam = new DataPersistenceHandler($ReplacementPerson, []); @@ -48,7 +46,6 @@ class MultipleActionGroupsTestCest */ public function _after(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_AFTER); $I->fillField("#foo", "myData1"); $I->fillField("#bar", "myData2"); } @@ -60,12 +57,6 @@ class MultipleActionGroupsTestCest public function _failed(AcceptanceTester $I) { $I->saveScreenshot(); - if (TestContextExtension::getTestPhase() !==TestContextExtension::TEST_PHASE_AFTER) { - try { - $this->_after($I); - } catch (\Exception $failedException) { - } - } } /** @@ -79,7 +70,6 @@ class MultipleActionGroupsTestCest */ public function MultipleActionGroupsTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amOnPage("/someUrl"); $I->amOnPage("/Jane/Dane.html"); $I->fillField("#foo", "Jane"); diff --git a/dev/tests/verification/Resources/PageReplacementTest.txt b/dev/tests/verification/Resources/PageReplacementTest.txt index 4fb5d5f12..5621e5c7a 100644 --- a/dev/tests/verification/Resources/PageReplacementTest.txt +++ b/dev/tests/verification/Resources/PageReplacementTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class PageReplacementTestCest */ public function PageReplacementTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: datakey"); $simpleData = DataObjectHandler::getInstance()->getObject("simpleData"); $datakey = new DataPersistenceHandler($simpleData, []); diff --git a/dev/tests/verification/Resources/ParameterArrayTest.txt b/dev/tests/verification/Resources/ParameterArrayTest.txt index d197701bd..2e196225d 100644 --- a/dev/tests/verification/Resources/ParameterArrayTest.txt +++ b/dev/tests/verification/Resources/ParameterArrayTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class ParameterArrayTestCest */ public function ParameterArrayTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: simpleDataKey"); $simpleParamData = DataObjectHandler::getInstance()->getObject("simpleParamData"); $simpleDataKey = new DataPersistenceHandler($simpleParamData, []); diff --git a/dev/tests/verification/Resources/PersistedReplacementTest.txt b/dev/tests/verification/Resources/PersistedReplacementTest.txt index 049fd3f5f..ca09c767e 100644 --- a/dev/tests/verification/Resources/PersistedReplacementTest.txt +++ b/dev/tests/verification/Resources/PersistedReplacementTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -31,7 +30,6 @@ class PersistedReplacementTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $I->amGoingTo("create entity that has the stepKey: createData1"); $ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson"); $this->createData1 = new DataPersistenceHandler($ReplacementPerson, []); @@ -46,7 +44,6 @@ class PersistedReplacementTestCest */ public function PersistedReplacementTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->amGoingTo("create entity that has the stepKey: createdData"); $simpleData = DataObjectHandler::getInstance()->getObject("simpleData"); $createdData = new DataPersistenceHandler($simpleData, []); diff --git a/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt b/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt index 3fc24f984..53db9bcf8 100644 --- a/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt +++ b/dev/tests/verification/Resources/PersistenceCustomFieldsTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -36,7 +35,6 @@ class PersistenceCustomFieldsTestCest */ public function _before(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_BEFORE); $createData1Fields['firstname'] = "Mac"; $createData1Fields['lastname'] = "Doe"; $I->amGoingTo("create entity that has the stepKey: createData1"); @@ -58,7 +56,6 @@ class PersistenceCustomFieldsTestCest */ public function PersistenceCustomFieldsTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $createdDataFields['favoriteIndex'] = "1"; $createdDataFields['middlename'] = "Kovacs"; $I->amGoingTo("create entity that has the stepKey: createdData"); diff --git a/dev/tests/verification/Resources/SectionReplacementTest.txt b/dev/tests/verification/Resources/SectionReplacementTest.txt index 640d8e3c0..b89eb130b 100644 --- a/dev/tests/verification/Resources/SectionReplacementTest.txt +++ b/dev/tests/verification/Resources/SectionReplacementTest.txt @@ -5,7 +5,6 @@ use Magento\FunctionalTestingFramework\AcceptanceTester; use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler; use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler; use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject; -use Magento\FunctionalTestingFramework\Extension\TestContextExtension; use \Codeception\Util\Locator; use Yandex\Allure\Adapter\Annotation\Features; use Yandex\Allure\Adapter\Annotation\Stories; @@ -28,7 +27,6 @@ class SectionReplacementTestCest */ public function SectionReplacementTest(AcceptanceTester $I) { - TestContextExtension::setTestPhase(TestContextExtension::TEST_PHASE_TEST); $I->click("#element"); $I->click("#foo"); $I->waitForPageLoad(30); diff --git a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php index 5025b10cf..a518c9234 100644 --- a/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php +++ b/src/Magento/FunctionalTestingFramework/Extension/TestContextExtension.php @@ -60,7 +60,7 @@ function () use ($cest, $I) { */ public function extractContext($trace, $class) { - foreach($trace as $entry) { + foreach ($trace as $entry) { $traceClass = $entry["class"] ?? null; if (strpos($traceClass, $class) != 0) { return $entry["function"];