diff --git a/dev/tests/unit/Magento/FunctionalTestFramework/Test/Config/ActionGroupDomTest.php b/dev/tests/unit/Magento/FunctionalTestFramework/Test/Config/ActionGroupDomTest.php index 6a0c926be..7208b86f7 100644 --- a/dev/tests/unit/Magento/FunctionalTestFramework/Test/Config/ActionGroupDomTest.php +++ b/dev/tests/unit/Magento/FunctionalTestFramework/Test/Config/ActionGroupDomTest.php @@ -54,10 +54,10 @@ public function testActionGroupDomInvalidXmlValidation() public function testActionGroupDomDuplicateActionGroupsValidation() { $sampleXml = ' - + - + '; @@ -65,7 +65,7 @@ public function testActionGroupDomDuplicateActionGroupsValidation() $exceptionCollector = new ExceptionCollector(); new ActionGroupDom($sampleXml, 'dupeNameActionGroup.xml', $exceptionCollector); $this->expectException(\Exception::class); - $this->expectExceptionMessageRegExp("/name: actionGroupName is used more than once./"); + $this->expectExceptionMessageRegExp("/name: ActionGroupNameActionGroup is used more than once./"); $exceptionCollector->throwException(); } } diff --git a/dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt b/dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgTextActionGroup.txt similarity index 71% rename from dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt rename to dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgTextActionGroup.txt index 1eb3d6566..73ff91772 100644 --- a/dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgText.txt +++ b/dev/tests/verification/Resources/ActionGroupContainsStepKeyInArgTextActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupContainsStepKeyInArgTextCest +class ActionGroupContainsStepKeyInArgTextActionGroupCest { /** * @param AcceptanceTester $I @@ -23,9 +23,9 @@ class ActionGroupContainsStepKeyInArgTextCest */ public function _before(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupContainsStepKeyInArgValue"); + $I->comment("Entering Action Group [actionGroup] ActionGroupContainsStepKeyInArgValueActionGroup"); $I->see("arg1", ".selector"); // stepKey: arg1ActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupContainsStepKeyInArgValue"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupContainsStepKeyInArgValueActionGroup"); } /** @@ -37,8 +37,8 @@ class ActionGroupContainsStepKeyInArgTextCest */ public function ActionGroupContainsStepKeyInArgText(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupContainsStepKeyInArgValue"); + $I->comment("Entering Action Group [actionGroup] ActionGroupContainsStepKeyInArgValueActionGroup"); $I->see("arg1", ".selector"); // stepKey: arg1ActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupContainsStepKeyInArgValue"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupContainsStepKeyInArgValueActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt b/dev/tests/verification/Resources/ActionGroupMergedViaInsertAfterActionGroup.txt similarity index 91% rename from dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt rename to dev/tests/verification/Resources/ActionGroupMergedViaInsertAfterActionGroup.txt index b4745e0c0..d7081121a 100644 --- a/dev/tests/verification/Resources/ActionGroupMergedViaInsertAfter.txt +++ b/dev/tests/verification/Resources/ActionGroupMergedViaInsertAfterActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupMergedViaInsertAfterCest +class ActionGroupMergedViaInsertAfterActionGroupCest { /** * @Features({"TestModule"}) @@ -26,13 +26,13 @@ class ActionGroupMergedViaInsertAfterCest */ public function ActionGroupMergedViaInsertAfter(AcceptanceTester $I) { - $I->comment("Entering Action Group [keyone] FunctionalActionGroupForMassMergeAfter"); + $I->comment("Entering Action Group [keyone] FunctionalActionGroupForMassMergeAfterActionGroup"); $I->fillField("#foo", "foo"); // stepKey: fillField1Keyone $I->fillField("#bar", "bar"); // stepKey: fillField2Keyone $I->click("#foo2"); // stepKey: mergeAfterBarKeyone $I->click("#bar2"); // stepKey: mergeAfterFoo2Keyone $I->click("#baz2"); // stepKey: mergeAfterBar2Keyone $I->fillField("#baz", "baz"); // stepKey: fillField3Keyone - $I->comment("Exiting Action Group [keyone] FunctionalActionGroupForMassMergeAfter"); + $I->comment("Exiting Action Group [keyone] FunctionalActionGroupForMassMergeAfterActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt b/dev/tests/verification/Resources/ActionGroupMergedViaInsertBeforeActionGroup.txt similarity index 86% rename from dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt rename to dev/tests/verification/Resources/ActionGroupMergedViaInsertBeforeActionGroup.txt index b27328275..9eb74e222 100644 --- a/dev/tests/verification/Resources/ActionGroupMergedViaInsertBefore.txt +++ b/dev/tests/verification/Resources/ActionGroupMergedViaInsertBeforeActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupMergedViaInsertBeforeCest +class ActionGroupMergedViaInsertBeforeActionGroupCest { /** * @Features({"TestModule"}) @@ -24,15 +24,15 @@ class ActionGroupMergedViaInsertBeforeCest * @return void * @throws \Exception */ - public function ActionGroupMergedViaInsertBefore(AcceptanceTester $I) + public function ActionGroupMergedViaInsertBeforeActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [keyone] FunctionalActionGroupForMassMergeBefore"); + $I->comment("Entering Action Group [keyone] FunctionalActionGroupForMassMergeBeforeActionGroup"); $I->fillField("#foo", "foo"); // stepKey: fillField1Keyone $I->click("#foo2"); // stepKey: mergeBeforeBarKeyone $I->click("#bar2"); // stepKey: mergeAfterFoo2Keyone $I->click("#baz2"); // stepKey: mergeAfterBar2Keyone $I->fillField("#bar", "bar"); // stepKey: fillField2Keyone $I->fillField("#baz", "baz"); // stepKey: fillField3Keyone - $I->comment("Exiting Action Group [keyone] FunctionalActionGroupForMassMergeBefore"); + $I->comment("Exiting Action Group [keyone] FunctionalActionGroupForMassMergeBeforeActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupSkipReadiness.txt b/dev/tests/verification/Resources/ActionGroupSkipReadinessActionGroup.txt similarity index 73% rename from dev/tests/verification/Resources/ActionGroupSkipReadiness.txt rename to dev/tests/verification/Resources/ActionGroupSkipReadinessActionGroup.txt index 11025fefe..ba5b174f7 100644 --- a/dev/tests/verification/Resources/ActionGroupSkipReadiness.txt +++ b/dev/tests/verification/Resources/ActionGroupSkipReadinessActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupSkipReadinessCest +class ActionGroupSkipReadinessActionGroupCest { /** * @Features({"TestModule"}) @@ -24,12 +24,12 @@ class ActionGroupSkipReadinessCest * @return void * @throws \Exception */ - public function ActionGroupSkipReadiness(AcceptanceTester $I) + public function ActionGroupSkipReadinessActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group actionGroupWithSkipReadinessActions (skipReadinessActionGroup)"); + $I->comment("Entering Action Group ActionGroupWithSkipReadinessActionsActionGroup (skipReadinessActionGroup)"); $I->skipReadinessCheck(true); $I->comment("ActionGroupSkipReadiness"); $I->skipReadinessCheck(false); - $I->comment("Exiting Action Group actionGroupWithSkipReadinessActions (skipReadinessActionGroup)"); + $I->comment("Exiting Action Group ActionGroupWithSkipReadinessActionsActionGroup (skipReadinessActionGroup)"); } } diff --git a/dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt b/dev/tests/verification/Resources/ActionGroupToExtendActionGroup.txt similarity index 88% rename from dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt rename to dev/tests/verification/Resources/ActionGroupToExtendActionGroup.txt index 5814e85e0..5b06b997f 100644 --- a/dev/tests/verification/Resources/ActionGroupUsingNestedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupToExtendActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupUsingNestedArgumentCest +class ActionGroupToExtendActionGroupCest { /** * @Features({"TestModule"}) @@ -24,11 +24,11 @@ class ActionGroupUsingNestedArgumentCest * @return void * @throws \Exception */ - public function ActionGroupUsingNestedArgument(AcceptanceTester $I) + public function ActionGroupToExtendActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] ActionGroupToExtend"); + $I->comment("Entering Action Group [actionGroup] ActionGroupToExtendActionGroup"); $grabProductsActionGroup = $I->grabMultiple("selector"); // stepKey: grabProductsActionGroup $I->assertCount(99, $grabProductsActionGroup); // stepKey: assertCountActionGroup - $I->comment("Exiting Action Group [actionGroup] ActionGroupToExtend"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupToExtendActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupUsingCreateData.txt b/dev/tests/verification/Resources/ActionGroupUsingCreateDataActionGroup.txt similarity index 80% rename from dev/tests/verification/Resources/ActionGroupUsingCreateData.txt rename to dev/tests/verification/Resources/ActionGroupUsingCreateDataActionGroup.txt index fb76b4f44..b77573b96 100644 --- a/dev/tests/verification/Resources/ActionGroupUsingCreateData.txt +++ b/dev/tests/verification/Resources/ActionGroupUsingCreateDataActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupUsingCreateDataCest +class ActionGroupUsingCreateDataActionGroupCest { /** * @param AcceptanceTester $I @@ -23,10 +23,10 @@ class ActionGroupUsingCreateDataCest */ public function _before(AcceptanceTester $I) { - $I->comment("Entering Action Group [Key1] actionGroupWithCreateData"); + $I->comment("Entering Action Group [Key1] ActionGroupWithCreateDataActionGroup"); $I->createEntity("createCategoryKey1", "hook", "ApiCategory", [], []); // stepKey: createCategoryKey1 $I->createEntity("createConfigProductKey1", "hook", "ApiConfigurableProduct", ["createCategoryKey1"], []); // stepKey: createConfigProductKey1 - $I->comment("Exiting Action Group [Key1] actionGroupWithCreateData"); + $I->comment("Exiting Action Group [Key1] ActionGroupWithCreateDataActionGroup"); } /** @@ -36,7 +36,7 @@ class ActionGroupUsingCreateDataCest * @return void * @throws \Exception */ - public function ActionGroupUsingCreateData(AcceptanceTester $I) + public function ActionGroupUsingCreateDataActionGroupAcceptanceTester $I) { } } diff --git a/dev/tests/verification/Resources/ActionGroupToExtend.txt b/dev/tests/verification/Resources/ActionGroupUsingNestedArgumentActionGroup.txt similarity index 86% rename from dev/tests/verification/Resources/ActionGroupToExtend.txt rename to dev/tests/verification/Resources/ActionGroupUsingNestedArgumentActionGroup.txt index 133c9fb9b..af3f2f9d0 100644 --- a/dev/tests/verification/Resources/ActionGroupToExtend.txt +++ b/dev/tests/verification/Resources/ActionGroupUsingNestedArgumentActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupToExtendCest +class ActionGroupUsingNestedArgumentActionGroupCest { /** * @Features({"TestModule"}) @@ -24,11 +24,11 @@ class ActionGroupToExtendCest * @return void * @throws \Exception */ - public function ActionGroupToExtend(AcceptanceTester $I) + public function ActionGroupUsingNestedArgumentActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] ActionGroupToExtend"); + $I->comment("Entering Action Group [actionGroup] ActionGroupToExtendActionGroup"); $grabProductsActionGroup = $I->grabMultiple("selector"); // stepKey: grabProductsActionGroup $I->assertCount(99, $grabProductsActionGroup); // stepKey: assertCountActionGroup - $I->comment("Exiting Action Group [actionGroup] ActionGroupToExtend"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupToExtendActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTestActionGroup.txt similarity index 92% rename from dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt rename to dev/tests/verification/Resources/ActionGroupWithDataOverrideTestActionGroup.txt index a455d98e0..ea789d44d 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDataOverrideTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDataOverrideTestActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @group functional * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupWithDataOverrideTestCest +class ActionGroupWithDataOverrideTestActionGroupCest { /** * @param AcceptanceTester $I @@ -61,16 +61,16 @@ class ActionGroupWithDataOverrideTestCest * @return void * @throws \Exception */ - public function ActionGroupWithDataOverrideTest(AcceptanceTester $I) + public function ActionGroupWithDataOverrideTestActionGroup(AcceptanceTester $I) { $I->amOnPage("/someUrl"); // stepKey: step1 - $I->comment("Entering Action Group [actionGroupWithDataOverride1] FunctionalActionGroupWithData"); + $I->comment("Entering Action Group [actionGroupWithDataOverride1] FunctionalActionGroupWithDataActionGroup"); $I->amOnPage("/John/Doe.html"); // stepKey: amOnPage1ActionGroupWithDataOverride1 $I->fillField("#foo", "John"); // stepKey: fillField1ActionGroupWithDataOverride1 $I->fillField("#bar", "Doe"); // stepKey: fillField2ActionGroupWithDataOverride1 $I->searchAndMultiSelectOption("#foo", ["John", "Doe"]); // stepKey: multi1ActionGroupWithDataOverride1 $I->see("#element .John"); // stepKey: see1ActionGroupWithDataOverride1 - $I->comment("Exiting Action Group [actionGroupWithDataOverride1] FunctionalActionGroupWithData"); + $I->comment("Exiting Action Group [actionGroupWithDataOverride1] FunctionalActionGroupWithDataActionGroup"); $I->click("loginButton"); // stepKey: step6 } } diff --git a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt b/dev/tests/verification/Resources/ActionGroupWithDataTestActionGroup.txt similarity index 95% rename from dev/tests/verification/Resources/ActionGroupWithDataTest.txt rename to dev/tests/verification/Resources/ActionGroupWithDataTestActionGroup.txt index 7ac32f550..95fb2cf54 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDataTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDataTestActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @group functional * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupWithDataTestCest +class ActionGroupWithDataTestActionGroupCest { /** * @param AcceptanceTester $I @@ -61,7 +61,7 @@ class ActionGroupWithDataTestCest * @return void * @throws \Exception */ - public function ActionGroupWithDataTest(AcceptanceTester $I) + public function ActionGroupWithDataTestActionGroup(AcceptanceTester $I) { $I->amOnPage("/someUrl"); // stepKey: step1 $I->comment("Entering Action Group [actionGroupWithData1] FunctionalActionGroupWithData"); diff --git a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup.txt similarity index 76% rename from dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt rename to dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup.txt index 289bbe4e1..dc1912f19 100644 --- a/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParam.txt +++ b/dev/tests/verification/Resources/ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Default Argument Value and Hardcoded Value in Param") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithDefaultArgumentAndStringSelectorParamCest +class ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroupCest { /** * @Severity(level = SeverityLevel::BLOCKER) @@ -26,10 +26,10 @@ class ActionGroupWithDefaultArgumentAndStringSelectorParamCest * @return void * @throws \Exception */ - public function ActionGroupWithDefaultArgumentAndStringSelectorParam(AcceptanceTester $I) + public function ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithDefaultArgumentAndStringSelectorParam"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup"); $I->see("John", "#element .test1"); // stepKey: seeFirstNameActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithDefaultArgumentAndStringSelectorParam"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentActionGroup.txt similarity index 79% rename from dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt rename to dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentActionGroup.txt index 4e94978ad..9914728e2 100644 --- a/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Passed Argument Value and Multiple Argument Values in Param") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest +class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentActionGroupCest { /** * @Severity(level = SeverityLevel::BLOCKER) @@ -26,10 +26,10 @@ class ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentCest * @return void * @throws \Exception */ - public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgument(AcceptanceTester $I) + public function ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithMultipleParameterSelectorsFromArgument"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithMultipleParameterSelectorsFromArgumentActionGroup"); $I->see("Doe", "#John-Doe .test"); // stepKey: seeLastNameActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithMultipleParameterSelectorsFromArgument"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithMultipleParameterSelectorsFromArgumentActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt b/dev/tests/verification/Resources/ActionGroupWithNoArgumentsActionGroup.txt similarity index 76% rename from dev/tests/verification/Resources/ActionGroupWithNoArguments.txt rename to dev/tests/verification/Resources/ActionGroupWithNoArgumentsActionGroup.txt index 6158b5af7..3883a99d1 100644 --- a/dev/tests/verification/Resources/ActionGroupWithNoArguments.txt +++ b/dev/tests/verification/Resources/ActionGroupWithNoArgumentsActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With No Argument") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithNoArgumentsCest +class ActionGroupWithNoArgumentsActionGroupCest { /** * @Severity(level = SeverityLevel::BLOCKER) @@ -26,10 +26,10 @@ class ActionGroupWithNoArgumentsCest * @return void * @throws \Exception */ - public function ActionGroupWithNoArguments(AcceptanceTester $I) + public function ActionGroupWithNoArgumentsActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithoutArguments"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithoutArgumentsActionGroup"); $I->wait(1); // stepKey: waitForNothingActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithoutArguments"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithoutArgumentsActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTestActionGroup.txt similarity index 95% rename from dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt rename to dev/tests/verification/Resources/ActionGroupWithNoDefaultTestActionGroup.txt index ca6474a7b..f73d4ba3b 100644 --- a/dev/tests/verification/Resources/ActionGroupWithNoDefaultTest.txt +++ b/dev/tests/verification/Resources/ActionGroupWithNoDefaultTestActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @group functional * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupWithNoDefaultTestCest +class ActionGroupWithNoDefaultTestActionGroupCest { /** * @param AcceptanceTester $I @@ -61,7 +61,7 @@ class ActionGroupWithNoDefaultTestCest * @return void * @throws \Exception */ - public function ActionGroupWithNoDefaultTest(AcceptanceTester $I) + public function ActionGroupWithNoDefaultTestActionGroup(AcceptanceTester $I) { $I->amOnPage("/someUrl"); // stepKey: step1 $I->comment("Entering Action Group [actionGroupWithDataOverride1] FunctionalActionGroupNoDefault"); diff --git a/dev/tests/verification/Resources/ActionGroupWithParameterizedElementWithHyphen.txt b/dev/tests/verification/Resources/ActionGroupWithParameterizedElementWithHyphenActionGroup.txt similarity index 87% rename from dev/tests/verification/Resources/ActionGroupWithParameterizedElementWithHyphen.txt rename to dev/tests/verification/Resources/ActionGroupWithParameterizedElementWithHyphenActionGroup.txt index 52dc8bd1b..b26ab3e45 100644 --- a/dev/tests/verification/Resources/ActionGroupWithParameterizedElementWithHyphen.txt +++ b/dev/tests/verification/Resources/ActionGroupWithParameterizedElementWithHyphenActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithParameterizedElementWithHyphenCest +class ActionGroupWithParameterizedElementWithHyphenActionGroupCest { /** * @Features({"TestModule"}) @@ -24,7 +24,7 @@ class ActionGroupWithParameterizedElementWithHyphenCest * @return void * @throws \Exception */ - public function ActionGroupWithParameterizedElementWithHyphen(AcceptanceTester $I) + public function ActionGroupWithParameterizedElementWithHyphenActionGroup(AcceptanceTester $I) { $I->comment("Entering Action Group [actionGroup] SectionArgumentWithParameterizedSelector"); $keyoneActionGroup = $I->executeJS("#element .full-width"); // stepKey: keyoneActionGroup diff --git a/dev/tests/verification/Resources/ActionGroupWithParameterizedElementsWithStepKeyReferences.txt b/dev/tests/verification/Resources/ActionGroupWithParameterizedElementsWithStepKeyReferencesActionGroup.txt similarity index 83% rename from dev/tests/verification/Resources/ActionGroupWithParameterizedElementsWithStepKeyReferences.txt rename to dev/tests/verification/Resources/ActionGroupWithParameterizedElementsWithStepKeyReferencesActionGroup.txt index b0758e679..1eba34c5a 100644 --- a/dev/tests/verification/Resources/ActionGroupWithParameterizedElementsWithStepKeyReferences.txt +++ b/dev/tests/verification/Resources/ActionGroupWithParameterizedElementsWithStepKeyReferencesActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithParameterizedElementsWithStepKeyReferencesCest +class ActionGroupWithParameterizedElementsWithStepKeyReferencesActionGroupCest { /** * @Features({"TestModule"}) @@ -24,15 +24,15 @@ class ActionGroupWithParameterizedElementsWithStepKeyReferencesCest * @return void * @throws \Exception */ - public function ActionGroupWithParameterizedElementsWithStepKeyReferences(AcceptanceTester $I) + public function ActionGroupWithParameterizedElementsWithStepKeyReferencesActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithParametrizedSelectors"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithParametrizedSelectorsActionGroup"); $testVariableActionGroup = $I->executeJS("return 1"); // stepKey: testVariableActionGroup $testVariable2ActionGroup = $I->executeJS("return 'test'"); // stepKey: testVariable2ActionGroup $I->createEntity("createSimpleDataActionGroup", "test", "simpleData", [], []); // stepKey: createSimpleDataActionGroup $I->click("#{$testVariable2ActionGroup} .John"); // stepKey: click1ActionGroup $I->click("#Doe-" . msq("simpleParamData") . "prename .{$testVariableActionGroup}"); // stepKey: click2ActionGroup $I->seeElement("//div[@name='Tiberius'][@class={$testVariableActionGroup}][@data-element='{$testVariable2ActionGroup}'][" . $I->retrieveEntityField('createSimpleData', 'name', 'test') . "]"); // stepKey: see1ActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithParametrizedSelectors"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithParametrizedSelectorsActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParamActionGroup.txt similarity index 76% rename from dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt rename to dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParamActionGroup.txt index 254fbe0f2..706432407 100644 --- a/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParam.txt +++ b/dev/tests/verification/Resources/ActionGroupWithPassedArgumentAndStringSelectorParamActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Passed Argument Value and Hardcoded Value in Param") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithPassedArgumentAndStringSelectorParamCest +class ActionGroupWithPassedArgumentAndStringSelectorParamActionGroupCest { /** * @Severity(level = SeverityLevel::BLOCKER) @@ -26,10 +26,10 @@ class ActionGroupWithPassedArgumentAndStringSelectorParamCest * @return void * @throws \Exception */ - public function ActionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I) + public function ActionGroupWithPassedArgumentAndStringSelectorParamActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithDefaultArgumentAndStringSelectorParam"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup"); $I->see("John" . msq("UniquePerson"), "#element .test1"); // stepKey: seeFirstNameActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithDefaultArgumentAndStringSelectorParam"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithPersistedDataActionGroup.txt similarity index 96% rename from dev/tests/verification/Resources/ActionGroupWithPersistedData.txt rename to dev/tests/verification/Resources/ActionGroupWithPersistedDataActionGroup.txt index e8eb29996..c1979f3a4 100644 --- a/dev/tests/verification/Resources/ActionGroupWithPersistedData.txt +++ b/dev/tests/verification/Resources/ActionGroupWithPersistedDataActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @group functional * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupWithPersistedDataCest +class ActionGroupWithPersistedDataActionGroupCest { /** * @param AcceptanceTester $I @@ -61,7 +61,7 @@ class ActionGroupWithPersistedDataCest * @return void * @throws \Exception */ - public function ActionGroupWithPersistedData(AcceptanceTester $I) + public function ActionGroupWithPersistedDataActionGroup(AcceptanceTester $I) { $I->createEntity("createPerson", "test", "DefaultPerson", [], []); // stepKey: createPerson $I->comment("Entering Action Group [actionGroupWithPersistedData1] FunctionalActionGroupWithData"); diff --git a/dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArguments.txt b/dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArgumentsActionGroup.txt similarity index 72% rename from dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArguments.txt rename to dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArgumentsActionGroup.txt index ec6111062..99d504cdd 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArguments.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSectionAndDataAsArgumentsActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithSectionAndDataAsArgumentsCest +class ActionGroupWithSectionAndDataAsArgumentsActionGroupCest { /** * @Features({"TestModule"}) @@ -24,10 +24,10 @@ class ActionGroupWithSectionAndDataAsArgumentsCest * @return void * @throws \Exception */ - public function ActionGroupWithSectionAndDataAsArguments(AcceptanceTester $I) + public function ActionGroupWithSectionAndDataAsArgumentsActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithSectionAndData"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithSectionAndDataActionGroup"); $I->waitForElementVisible("#element .John", 10); // stepKey: arg1ActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithSectionAndData"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithSectionAndDataActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgumentActionGroup.txt similarity index 79% rename from dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt rename to dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgumentActionGroup.txt index f4faf0773..7684c33e8 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromDefaultArgumentActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Simple Data Usage From Default Argument") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest +class ActionGroupWithSimpleDataUsageFromDefaultArgumentActionGroupCest { /** * @Severity(level = SeverityLevel::CRITICAL) @@ -26,10 +26,10 @@ class ActionGroupWithSimpleDataUsageFromDefaultArgumentCest * @return void * @throws \Exception */ - public function ActionGroupWithSimpleDataUsageFromDefaultArgument(AcceptanceTester $I) + public function ActionGroupWithSimpleDataUsageFromDefaultArgumentActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithStringUsage"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithStringUsageActionGroup"); $I->see("stringLiteral", "#element .stringLiteral"); // stepKey: see1ActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithStringUsage"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithStringUsageActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgumentActionGroup.txt similarity index 52% rename from dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt rename to dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgumentActionGroup.txt index 86791407d..7a947a64a 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSimpleDataUsageFromPassedArgumentActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Simple Data Usage From Passed Argument") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithSimpleDataUsageFromPassedArgumentCest +class ActionGroupWithSimpleDataUsageFromPassedArgumentActionGroupCest { /** * @Severity(level = SeverityLevel::CRITICAL) @@ -26,37 +26,37 @@ class ActionGroupWithSimpleDataUsageFromPassedArgumentCest * @return void * @throws \Exception */ - public function ActionGroupWithSimpleDataUsageFromPassedArgument(AcceptanceTester $I) + public function ActionGroupWithSimpleDataUsageFromPassedArgumentActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup1] actionGroupWithStringUsage"); + $I->comment("Entering Action Group [actionGroup1] ActionGroupWithStringUsageActionGroup"); $I->see("overrideString", "#element .overrideString"); // stepKey: see1ActionGroup1 - $I->comment("Exiting Action Group [actionGroup1] actionGroupWithStringUsage"); - $I->comment("Entering Action Group [actionGroup11] actionGroupWithStringUsage"); + $I->comment("Exiting Action Group [actionGroup1] ActionGroupWithStringUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup11] ActionGroupWithStringUsageActionGroup"); $I->see("1", "#element .1"); // stepKey: see1ActionGroup11 - $I->comment("Exiting Action Group [actionGroup11] actionGroupWithStringUsage"); - $I->comment("Entering Action Group [actionGroup12] actionGroupWithStringUsage"); + $I->comment("Exiting Action Group [actionGroup11] ActionGroupWithStringUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup12] ActionGroupWithStringUsageActionGroup"); $I->see("1.5", "#element .1.5"); // stepKey: see1ActionGroup12 - $I->comment("Exiting Action Group [actionGroup12] actionGroupWithStringUsage"); - $I->comment("Entering Action Group [actionGroup13] actionGroupWithStringUsage"); + $I->comment("Exiting Action Group [actionGroup12] ActionGroupWithStringUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup13] ActionGroupWithStringUsageActionGroup"); $I->see("true", "#element .true"); // stepKey: see1ActionGroup13 - $I->comment("Exiting Action Group [actionGroup13] actionGroupWithStringUsage"); - $I->comment("Entering Action Group [actionGroup2] actionGroupWithStringUsage"); + $I->comment("Exiting Action Group [actionGroup13] ActionGroupWithStringUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup2] ActionGroupWithStringUsageActionGroup"); $I->see("simpleData.firstname", "#element .simpleData.firstname"); // stepKey: see1ActionGroup2 - $I->comment("Exiting Action Group [actionGroup2] actionGroupWithStringUsage"); - $I->comment("Entering Action Group [actionGroup3] actionGroupWithStringUsage"); + $I->comment("Exiting Action Group [actionGroup2] ActionGroupWithStringUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup3] ActionGroupWithStringUsageActionGroup"); $I->see($I->retrieveEntityField('persisted', 'data', 'test'), "#element ." . $I->retrieveEntityField('persisted', 'data', 'test')); // stepKey: see1ActionGroup3 - $I->comment("Exiting Action Group [actionGroup3] actionGroupWithStringUsage"); - $I->comment("Entering Action Group [actionGroup4] actionGroupWithEntityUsage"); + $I->comment("Exiting Action Group [actionGroup3] ActionGroupWithStringUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup4] ActionGroupWithEntityUsageActionGroup"); $I->see("John", "#element .John"); // stepKey: see1ActionGroup4 - $I->comment("Exiting Action Group [actionGroup4] actionGroupWithEntityUsage"); - $I->comment("Entering Action Group [actionGroup5] actionGroupWithEntityUsage"); + $I->comment("Exiting Action Group [actionGroup4] ActionGroupWithEntityUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup5] ActionGroupWithEntityUsageActionGroup"); $I->see($I->retrieveEntityField('simpleData', 'firstname', 'test'), "#element ." . $I->retrieveEntityField('simpleData', 'firstname', 'test')); // stepKey: see1ActionGroup5 - $I->comment("Exiting Action Group [actionGroup5] actionGroupWithEntityUsage"); - $I->comment("Entering Action Group [actionGroup6] actionGroupWithEntityUsage"); + $I->comment("Exiting Action Group [actionGroup5] ActionGroupWithEntityUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup6] ActionGroupWithEntityUsageActionGroup"); $I->see($I->retrieveEntityField('simpleData', 'firstname[0]', 'test'), "#element ." . $I->retrieveEntityField('simpleData', 'firstname[0]', 'test')); // stepKey: see1ActionGroup6 - $I->comment("Exiting Action Group [actionGroup6] actionGroupWithEntityUsage"); - $I->comment("Entering Action Group [actionGroup7] actionGroupWithEntityUsage"); + $I->comment("Exiting Action Group [actionGroup6] ActionGroupWithEntityUsageActionGroup"); + $I->comment("Entering Action Group [actionGroup7] ActionGroupWithEntityUsageActionGroup"); $I->see($I->retrieveEntityField('simpleData', 'firstname[data_index]', 'test'), "#element ." . $I->retrieveEntityField('simpleData', 'firstname[data_index]', 'test')); // stepKey: see1ActionGroup7 - $I->comment("Exiting Action Group [actionGroup7] actionGroupWithEntityUsage"); + $I->comment("Exiting Action Group [actionGroup7] ActionGroupWithEntityUsageActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgumentActionGroup.txt similarity index 75% rename from dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt rename to dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgumentActionGroup.txt index 5d8298108..456b46c24 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromDefaultArgumentActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Default Argument Value and Argument Value in Param") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest +class ActionGroupWithSingleParameterSelectorFromDefaultArgumentActionGroupCest { /** * @Severity(level = SeverityLevel::BLOCKER) @@ -26,10 +26,10 @@ class ActionGroupWithSingleParameterSelectorFromDefaultArgumentCest * @return void * @throws \Exception */ - public function ActionGroupWithSingleParameterSelectorFromDefaultArgument(AcceptanceTester $I) + public function ActionGroupWithSingleParameterSelectorFromDefaultArgumentActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithSingleParameterSelectorFromArgument"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithSingleParameterSelectorFromArgumentActionGroup"); $I->see("Doe", "#element .John"); // stepKey: seeLastNameActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithSingleParameterSelectorFromArgument"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithSingleParameterSelectorFromArgumentActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgumentActionGroup.txt similarity index 76% rename from dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt rename to dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgumentActionGroup.txt index 283a9fdd7..4faabdcba 100644 --- a/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgument.txt +++ b/dev/tests/verification/Resources/ActionGroupWithSingleParameterSelectorFromPassedArgumentActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @Title("[NO TESTCASEID]: Action Group With Passed Argument Value and Argument Value in Param") * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest +class ActionGroupWithSingleParameterSelectorFromPassedArgumentActionGroupCest { /** * @Severity(level = SeverityLevel::BLOCKER) @@ -26,10 +26,10 @@ class ActionGroupWithSingleParameterSelectorFromPassedArgumentCest * @return void * @throws \Exception */ - public function ActionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I) + public function ActionGroupWithSingleParameterSelectorFromPassedArgumentActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroup] actionGroupWithSingleParameterSelectorFromArgument"); + $I->comment("Entering Action Group [actionGroup] ActionGroupWithSingleParameterSelectorFromArgumentActionGroup"); $I->see("Doe", "#element .John" . msq("UniquePerson")); // stepKey: seeLastNameActionGroup - $I->comment("Exiting Action Group [actionGroup] actionGroupWithSingleParameterSelectorFromArgument"); + $I->comment("Exiting Action Group [actionGroup] ActionGroupWithSingleParameterSelectorFromArgumentActionGroup"); } } diff --git a/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt b/dev/tests/verification/Resources/ActionGroupWithStepKeyReferencesActionGroup.txt similarity index 95% rename from dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt rename to dev/tests/verification/Resources/ActionGroupWithStepKeyReferencesActionGroup.txt index 2ee5b4bf9..4ffe162d2 100644 --- a/dev/tests/verification/Resources/ActionGroupWithStepKeyReferences.txt +++ b/dev/tests/verification/Resources/ActionGroupWithStepKeyReferencesActionGroup.txt @@ -15,7 +15,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; /** * @Description("

Test files

verification/TestModule/Test/ActionGroupTest.xml
") */ -class ActionGroupWithStepKeyReferencesCest +class ActionGroupWithStepKeyReferencesActionGroupCest { /** * @Features({"TestModule"}) @@ -24,7 +24,7 @@ class ActionGroupWithStepKeyReferencesCest * @return void * @throws \Exception */ - public function ActionGroupWithStepKeyReferences(AcceptanceTester $I) + public function ActionGroupWithStepKeyReferencesActionGroup(AcceptanceTester $I) { $I->comment("Entering Action Group [actionGroup] FunctionActionGroupWithStepKeyReferences"); $I->createEntity("createSimpleDataActionGroup", "test", "simpleData", [], []); // stepKey: createSimpleDataActionGroup diff --git a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedDataActionGroup.txt similarity index 92% rename from dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt rename to dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedDataActionGroup.txt index ca8325402..18ea36295 100644 --- a/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedData.txt +++ b/dev/tests/verification/Resources/ActionGroupWithTopLevelPersistedDataActionGroup.txt @@ -16,7 +16,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId; * @group functional * @Description("

Test files

verification/TestModule/Test/ActionGroupFunctionalTest.xml
") */ -class ActionGroupWithTopLevelPersistedDataCest +class ActionGroupWithTopLevelPersistedDataActionGroupCest { /** * @param AcceptanceTester $I @@ -61,14 +61,14 @@ class ActionGroupWithTopLevelPersistedDataCest * @return void * @throws \Exception */ - public function ActionGroupWithTopLevelPersistedData(AcceptanceTester $I) + public function ActionGroupWithTopLevelPersistedDataActionGroup(AcceptanceTester $I) { - $I->comment("Entering Action Group [actionGroupWithPersistedData1] FunctionalActionGroupWithData"); + $I->comment("Entering Action Group [actionGroupWithPersistedData1] FunctionalActionGroupWithDataActionGroup"); $I->amOnPage("/" . $I->retrieveEntityField('createPersonParam', 'firstname', 'test') . "/" . $I->retrieveEntityField('createPersonParam', 'lastname', 'test') . ".html"); // stepKey: amOnPage1ActionGroupWithPersistedData1 $I->fillField("#foo", $I->retrieveEntityField('createPersonParam', 'firstname', 'test')); // stepKey: fillField1ActionGroupWithPersistedData1 $I->fillField("#bar", $I->retrieveEntityField('createPersonParam', 'lastname', 'test')); // stepKey: fillField2ActionGroupWithPersistedData1 $I->searchAndMultiSelectOption("#foo", [$I->retrieveEntityField('createPersonParam', 'firstname', 'test'), $I->retrieveEntityField('createPersonParam', 'lastname', 'test')]); // stepKey: multi1ActionGroupWithPersistedData1 $I->see("#element ." . $I->retrieveEntityField('createPersonParam', 'firstname', 'test')); // stepKey: see1ActionGroupWithPersistedData1 - $I->comment("Exiting Action Group [actionGroupWithPersistedData1] FunctionalActionGroupWithData"); + $I->comment("Exiting Action Group [actionGroupWithPersistedData1] FunctionalActionGroupWithDataActionGroup"); } } diff --git a/dev/tests/verification/Resources/functionalSuiteHooks.txt b/dev/tests/verification/Resources/functionalSuiteHooks.txt index 908cff8aa..3b166988c 100644 --- a/dev/tests/verification/Resources/functionalSuiteHooks.txt +++ b/dev/tests/verification/Resources/functionalSuiteHooks.txt @@ -43,13 +43,13 @@ class functionalSuiteHooks extends \Codeception\GroupObject try { $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver'); - + // close any open sessions if ($webDriver->webDriver != null) { $webDriver->webDriver->close(); $webDriver->webDriver = null; } - + // initialize the webdriver session $webDriver->_initializeSession(); $webDriver->amOnPage("some.url"); // stepKey: before @@ -61,9 +61,9 @@ class functionalSuiteHooks extends \Codeception\GroupObject $createFields ); $webDriver->click(PersistedObjectHandler::getInstance()->retrieveEntityField('create', 'data', 'suite')); // stepKey: clickWithData - print("Entering Action Group [AC] actionGroupWithTwoArguments"); + print("Entering Action Group [AC] ActionGroupWithTwoArgumentsActionGroup"); $webDriver->see("John", msq("uniqueData") . "John"); // stepKey: seeFirstNameAC - print("Exiting Action Group [AC] actionGroupWithTwoArguments"); + print("Exiting Action Group [AC] ActionGroupWithTwoArgumentsActionGroup"); // reset configuration and close session $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig(); @@ -112,20 +112,20 @@ class functionalSuiteHooks extends \Codeception\GroupObject } } $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver'); - + // close any open sessions if ($webDriver->webDriver != null) { $webDriver->webDriver->close(); $webDriver->webDriver = null; } - + // initialize the webdriver session $webDriver->_initializeSession(); $webDriver->amOnPage("some.url"); // stepKey: after $webDriver->deleteEntityByUrl("deleteThis"); // stepKey: delete - print("Entering Action Group [AC] actionGroupWithTwoArguments"); + print("Entering Action Group [AC] ActionGroupWithTwoArgumentsActionGroup"); $webDriver->see("John", msq("uniqueData") . "John"); // stepKey: seeFirstNameAC - print("Exiting Action Group [AC] actionGroupWithTwoArguments"); + print("Exiting Action Group [AC] ActionGroupWithTwoArgumentsActionGroup"); } catch (\Exception $exception) { print $exception->getMessage(); } diff --git a/dev/tests/verification/Resources/functionalSuiteWithComments.txt b/dev/tests/verification/Resources/functionalSuiteWithComments.txt index 0e15b7909..3dbf7ef0b 100644 --- a/dev/tests/verification/Resources/functionalSuiteWithComments.txt +++ b/dev/tests/verification/Resources/functionalSuiteWithComments.txt @@ -43,13 +43,13 @@ class functionalSuiteWithComments extends \Codeception\GroupObject try { $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver'); - + // close any open sessions if ($webDriver->webDriver != null) { $webDriver->webDriver->close(); $webDriver->webDriver = null; } - + // initialize the webdriver session $webDriver->_initializeSession(); print("Comment in Before"); @@ -63,9 +63,9 @@ class functionalSuiteWithComments extends \Codeception\GroupObject ); print(""); $webDriver->click(PersistedObjectHandler::getInstance()->retrieveEntityField('create', 'data', 'suite')); // stepKey: clickWithData - print("Entering Action Group [AC] actionGroupWithTwoArguments"); + print("Entering Action Group [AC] ActionGroupWithTwoArgumentsActionGroup"); $webDriver->see("John", msq("uniqueData") . "John"); // stepKey: seeFirstNameAC - print("Exiting Action Group [AC] actionGroupWithTwoArguments"); + print("Exiting Action Group [AC] ActionGroupWithTwoArgumentsActionGroup"); // reset configuration and close session $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver')->_resetConfig(); @@ -114,13 +114,13 @@ class functionalSuiteWithComments extends \Codeception\GroupObject } } $webDriver = $this->getModule('\Magento\FunctionalTestingFramework\Module\MagentoWebDriver'); - + // close any open sessions if ($webDriver->webDriver != null) { $webDriver->webDriver->close(); $webDriver->webDriver = null; } - + // initialize the webdriver session $webDriver->_initializeSession(); print("afterBlock"); diff --git a/dev/tests/verification/TestModule/ActionGroup/BasicActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/BasicActionGroup.xml index 45ccdbd24..3ff431b58 100644 --- a/dev/tests/verification/TestModule/ActionGroup/BasicActionGroup.xml +++ b/dev/tests/verification/TestModule/ActionGroup/BasicActionGroup.xml @@ -7,11 +7,11 @@ --> - + - + @@ -19,7 +19,7 @@ - + @@ -28,7 +28,7 @@ - + @@ -36,7 +36,7 @@ - + @@ -44,21 +44,21 @@ - + - + - + @@ -69,7 +69,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -93,29 +93,29 @@ - + - + - + - + - + diff --git a/dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml index 30cba3848..0f7cc108b 100644 --- a/dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml +++ b/dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml @@ -12,7 +12,7 @@ - + @@ -22,7 +22,7 @@ - + @@ -30,7 +30,7 @@ - + @@ -38,14 +38,14 @@ - + - + @@ -68,30 +68,30 @@ - + - + - + - + - + diff --git a/dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml index 7d8585772..e6f05f0c3 100644 --- a/dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml +++ b/dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml @@ -8,19 +8,19 @@ - + - + - + diff --git a/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml b/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml index fcc22acca..6f7747451 100644 --- a/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml +++ b/dev/tests/verification/TestModule/ActionGroup/XmlDuplicateActionGroup.xml @@ -7,7 +7,7 @@ --> - + diff --git a/dev/tests/verification/TestModule/Test/ActionGroupFunctionalTest.xml b/dev/tests/verification/TestModule/Test/ActionGroupFunctionalTest.xml index 8c24794e1..83f629c09 100644 --- a/dev/tests/verification/TestModule/Test/ActionGroupFunctionalTest.xml +++ b/dev/tests/verification/TestModule/Test/ActionGroupFunctionalTest.xml @@ -35,7 +35,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -73,7 +73,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -111,7 +111,7 @@ - + @@ -130,9 +130,9 @@ - + - + @@ -150,7 +150,7 @@ - + @@ -168,19 +168,19 @@ - + - + - + - + diff --git a/dev/tests/verification/TestModule/Test/ActionGroupTest.xml b/dev/tests/verification/TestModule/Test/ActionGroupTest.xml index 5dce96934..50a579c5b 100644 --- a/dev/tests/verification/TestModule/Test/ActionGroupTest.xml +++ b/dev/tests/verification/TestModule/Test/ActionGroupTest.xml @@ -12,7 +12,7 @@ </annotations> - <actionGroup ref="actionGroupWithoutArguments" stepKey="actionGroup"/> + <actionGroup ref="ActionGroupWithoutArgumentsActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupWithDefaultArgumentAndStringSelectorParam"> @@ -21,7 +21,7 @@ <title value="Action Group With Default Argument Value and Hardcoded Value in Param"/> </annotations> - <actionGroup ref="actionGroupWithDefaultArgumentAndStringSelectorParam" stepKey="actionGroup"/> + <actionGroup ref="ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupWithPassedArgumentAndStringSelectorParam"> @@ -30,7 +30,7 @@ <title value="Action Group With Passed Argument Value and Hardcoded Value in Param"/> </annotations> - <actionGroup ref="actionGroupWithDefaultArgumentAndStringSelectorParam" stepKey="actionGroup"> + <actionGroup ref="ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup" stepKey="actionGroup"> <argument name="someArgument" value="UniquePerson"/> </actionGroup> </test> @@ -41,7 +41,7 @@ <title value="Action Group With Default Argument Value and Argument Value in Param"/> </annotations> - <actionGroup ref="actionGroupWithSingleParameterSelectorFromArgument" stepKey="actionGroup"/> + <actionGroup ref="ActionGroupWithSingleParameterSelectorFromArgumentActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupWithSingleParameterSelectorFromPassedArgument"> @@ -50,7 +50,7 @@ <title value="Action Group With Passed Argument Value and Argument Value in Param"/> </annotations> - <actionGroup ref="actionGroupWithSingleParameterSelectorFromArgument" stepKey="actionGroup"> + <actionGroup ref="ActionGroupWithSingleParameterSelectorFromArgumentActionGroup" stepKey="actionGroup"> <argument name="someArgument" value="UniquePerson"/> </actionGroup> </test> @@ -61,7 +61,7 @@ <title value="Action Group With Passed Argument Value and Multiple Argument Values in Param"/> </annotations> - <actionGroup ref="actionGroupWithMultipleParameterSelectorsFromArgument" stepKey="actionGroup"/> + <actionGroup ref="ActionGroupWithMultipleParameterSelectorsFromArgumentActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupWithSimpleDataUsageFromPassedArgument"> @@ -70,35 +70,35 @@ <title value="Action Group With Simple Data Usage From Passed Argument"/> </annotations> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup1"> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup1"> <argument name="someArgument" value="overrideString"/> </actionGroup> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup11"> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup11"> <argument name="someArgument" value="1"/> </actionGroup> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup12"> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup12"> <argument name="someArgument" value="1.5"/> </actionGroup> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup13"> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup13"> <argument name="someArgument" value="true"/> </actionGroup> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup2"> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup2"> <argument name="someArgument" value="simpleData.firstname"/> </actionGroup> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup3"> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup3"> <argument name="someArgument" value="$persisted.data$"/> </actionGroup> - <actionGroup ref="actionGroupWithEntityUsage" stepKey="actionGroup4"> + <actionGroup ref="ActionGroupWithEntityUsageActionGroup" stepKey="actionGroup4"> <argument name="someArgument" value="simpleData.firstname"/> </actionGroup> - <actionGroup ref="actionGroupWithEntityUsage" stepKey="actionGroup5"> + <actionGroup ref="ActionGroupWithEntityUsageActionGroup" stepKey="actionGroup5"> <argument name="someArgument" value="$simpleData.firstname$"/> </actionGroup> - <actionGroup ref="actionGroupWithEntityUsage" stepKey="actionGroup6"> + <actionGroup ref="ActionGroupWithEntityUsageActionGroup" stepKey="actionGroup6"> <argument name="someArgument" value="$simpleData.firstname[0]$"/> </actionGroup> - <actionGroup ref="actionGroupWithEntityUsage" stepKey="actionGroup7"> + <actionGroup ref="ActionGroupWithEntityUsageActionGroup" stepKey="actionGroup7"> <argument name="someArgument" value="$simpleData.firstname[data_index]$"/> </actionGroup> </test> @@ -108,72 +108,72 @@ <severity value="CRITICAL"/> <title value="Action Group With Simple Data Usage From Default Argument"/> </annotations> - <actionGroup ref="actionGroupWithStringUsage" stepKey="actionGroup"/> + <actionGroup ref="ActionGroupWithStringUsageActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupWithStepKeyReferences"> - <actionGroup ref="FunctionActionGroupWithStepKeyReferences" stepKey="actionGroup"/> + <actionGroup ref="FunctionActionGroupWithStepKeyReferencesActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupUsingNestedArgument"> - <actionGroup ref="ActionGroupToExtend" stepKey="actionGroup"> + <actionGroup ref="ActionGroupToExtendActionGroup" stepKey="actionGroup"> <argument name="count" value="99"/> </actionGroup> </test> <test name="ActionGroupToExtend"> - <actionGroup ref="ActionGroupToExtend" stepKey="actionGroup"> + <actionGroup ref="ActionGroupToExtendActionGroup" stepKey="actionGroup"> <argument name="count" value="99"/> </actionGroup> </test> <test name="ExtendedActionGroup"> - <actionGroup ref="extendTestActionGroup" stepKey="actionGroup"> + <actionGroup ref="ExtendTestActionGroup" stepKey="actionGroup"> <argument name="count" value="99"/> <argument name="otherCount" value="8000"/> </actionGroup> </test> <test name="ExtendedRemoveActionGroup"> - <actionGroup ref="extendRemoveTestActionGroup" stepKey="actionGroup"/> + <actionGroup ref="ExtendRemoveTestActionGroup" stepKey="actionGroup"/> </test> <test name="ActionGroupUsingCreateData"> <before> - <actionGroup ref="actionGroupWithCreateData" stepKey="Key1"/> + <actionGroup ref="ActionGroupWithCreateDataActionGroup" stepKey="key1"/> </before> </test> <test name="ActionGroupSkipReadiness"> - <actionGroup ref="actionGroupWithSkipReadinessActions" stepKey="skipReadinessActionGroup"/> + <actionGroup ref="ActionGroupWithSkipReadinessActionsActionGroup" stepKey="skipReadinessActionGroup"/> </test> <test name="ActionGroupContainsStepKeyInArgText"> <before> - <actionGroup ref="actionGroupContainsStepKeyInArgValue" stepKey="actionGroup"> + <actionGroup ref="ActionGroupContainsStepKeyInArgValueActionGroup" stepKey="actionGroup"> <argument name="sameStepKeyAsArg" value="arg1"/> </actionGroup> </before> - <actionGroup ref="actionGroupContainsStepKeyInArgValue" stepKey="actionGroup"> + <actionGroup ref="ActionGroupContainsStepKeyInArgValueActionGroup" stepKey="actionGroup"> <argument name="sameStepKeyAsArg" value="arg1"/> </actionGroup> </test> <test name="ActionGroupWithSectionAndDataAsArguments"> - <actionGroup ref="actionGroupWithSectionAndData" stepKey="actionGroup"> + <actionGroup ref="ActionGroupWithSectionAndDataActionGroup" stepKey="actionGroup"> <argument name="content" value="{{simpleData.firstname}}"/> <argument name="section" value="SampleSection"/> </actionGroup> </test> <test name="ActionGroupWithParameterizedElementWithHyphen"> - <actionGroup ref="SectionArgumentWithParameterizedSelector" stepKey="actionGroup"> + <actionGroup ref="SectionArgumentWithParameterizedSelectorActionGroup" stepKey="actionGroup"> <argument name="section" value="SampleSection"/> </actionGroup> </test> <test name="ActionGroupWithParameterizedElementsWithStepKeyReferences"> - <actionGroup ref="actionGroupWithParametrizedSelectors" stepKey="actionGroup"> + <actionGroup ref="ActionGroupWithParametrizedSelectorsActionGroup" stepKey="actionGroup"> <argument name="param" value="simpleData"/> <argument name="param2" value="simpleParamData"/> </actionGroup> diff --git a/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml b/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml index f9caa59fc..155329da5 100644 --- a/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml +++ b/dev/tests/verification/TestModule/Test/LocatorFunctionTest.xml @@ -11,20 +11,20 @@ <test name="LocatorFunctionTest"> <createData entity="ReplacementPerson" stepKey="data"/> - <click stepKey="SimpleLocator" selector="{{LocatorFunctionSection.simpleLocator}}"/> - <click stepKey="SimpleLocatorNonShorthand" selector="{{LocatorFunctionSection.simpleLocatorNonShorthand}}"/> - <click stepKey="ArrayLocator" selector="{{LocatorFunctionSection.arrayLocator}}"/> + <click stepKey="simpleLocator" selector="{{LocatorFunctionSection.simpleLocator}}"/> + <click stepKey="simpleLocatorNonShorthand" selector="{{LocatorFunctionSection.simpleLocatorNonShorthand}}"/> + <click stepKey="arrayLocator" selector="{{LocatorFunctionSection.arrayLocator}}"/> - <click stepKey="OneParamLiteral" selector="{{LocatorFunctionSection.simpleLocatorOneParam('string')}}"/> - <click stepKey="OneParamData" selector="{{LocatorFunctionSection.simpleLocatorOneParam(ReplacementPerson.firstname)}}"/> - <click stepKey="OneParamPersisted" selector="{{LocatorFunctionSection.simpleLocatorOneParam($data.key$)}}"/> + <click stepKey="oneParamLiteral" selector="{{LocatorFunctionSection.simpleLocatorOneParam('string')}}"/> + <click stepKey="oneParamData" selector="{{LocatorFunctionSection.simpleLocatorOneParam(ReplacementPerson.firstname)}}"/> + <click stepKey="oneParamPersisted" selector="{{LocatorFunctionSection.simpleLocatorOneParam($data.key$)}}"/> - <click stepKey="TwoParamLiteral" selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', 'string2')}}"/> - <click stepKey="TwoParamData" selector="{{LocatorFunctionSection.simpleLocatorTwoParam(ReplacementPerson.firstname, ReplacementPerson.lastname)}}"/> - <click stepKey="TwoParamPersisted" selector="{{LocatorFunctionSection.simpleLocatorTwoParam($data.key1$, $data.key2$)}}"/> + <click stepKey="twoParamLiteral" selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', 'string2')}}"/> + <click stepKey="twoParamData" selector="{{LocatorFunctionSection.simpleLocatorTwoParam(ReplacementPerson.firstname, ReplacementPerson.lastname)}}"/> + <click stepKey="twoParamPersisted" selector="{{LocatorFunctionSection.simpleLocatorTwoParam($data.key1$, $data.key2$)}}"/> - <click stepKey="TwoParamMix1" selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', ReplacementPerson.firstname)}}"/> - <click stepKey="TwoParamMix2" selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', $data.key1$)}}"/> - <click stepKey="TwoParamMix3" selector="{{LocatorFunctionSection.simpleLocatorTwoParam(ReplacementPerson.firstname, $data.key1$)}}"/> + <click stepKey="twoParamMix1" selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', ReplacementPerson.firstname)}}"/> + <click stepKey="twoParamMix2" selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', $data.key1$)}}"/> + <click stepKey="twoParamMix3" selector="{{LocatorFunctionSection.simpleLocatorTwoParam(ReplacementPerson.firstname, $data.key1$)}}"/> </test> -</tests> \ No newline at end of file +</tests> diff --git a/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml b/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml index 20a9b6a28..12423ecce 100644 --- a/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml +++ b/dev/tests/verification/TestModule/Test/PersistenceActionGroupAppendingTest.xml @@ -10,8 +10,8 @@ xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd"> <test name="PersistenceActionGroupAppendingTest"> <before> - <actionGroup ref="DataPersistenceAppendingActionGroup" stepKey="ACTIONGROUPBEFORE"/> + <actionGroup ref="DataPersistenceAppendingActionGroup" stepKey="aCTIONGROUPBEFORE"/> </before> - <actionGroup ref="DataPersistenceAppendingActionGroup" stepKey="ACTIONGROUP"/> + <actionGroup ref="DataPersistenceAppendingActionGroup" stepKey="aCTIONGROUP"/> </test> </tests> diff --git a/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml b/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml index c56106693..c4a016cb0 100644 --- a/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml +++ b/dev/tests/verification/TestModule/Test/PersistenceCustomFieldsTest.xml @@ -33,6 +33,6 @@ <argument name="arg2" value="DefaultPerson.firstname"/> <argument name="arg3" value="$createdData3.firstname$"/> </actionGroup> - <actionGroup ref="DataPersistenceSelfReferenceActionGroup" stepKey="AGKEY"/> + <actionGroup ref="DataPersistenceSelfReferenceActionGroup" stepKey="aGKEY"/> </test> </tests> diff --git a/dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml b/dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml index 912854cc4..baf412c9a 100644 --- a/dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml +++ b/dev/tests/verification/TestModuleMerged/Test/MergeFunctionalTest.xml @@ -24,7 +24,7 @@ <remove keyForRemoval="step6"/> <click stepKey="step6Merge" selector="#step6Merged" after="step5"/> <click stepKey="step10" selector="#step10MergedInResult"/> - <actionGroup ref="FunctionalActionGroupWithData" stepKey="step8Merge" after="step7Merge"/> + <actionGroup ref="FunctionalActionGroupWithDataActionGroup" stepKey="step8Merge" after="step7Merge"/> </test> <test name="MergeSkip"> <annotations> diff --git a/dev/tests/verification/Tests/ActionGroupGenerationTest.php b/dev/tests/verification/Tests/ActionGroupGenerationTest.php index 3f9412aec..fdbecfc51 100644 --- a/dev/tests/verification/Tests/ActionGroupGenerationTest.php +++ b/dev/tests/verification/Tests/ActionGroupGenerationTest.php @@ -17,7 +17,7 @@ class ActionGroupGenerationTest extends MftfTestCase */ public function testActionGroupWithNoArguments() { - $this->generateAndCompareTest('ActionGroupWithNoArguments'); + $this->generateAndCompareTest('ActionGroupWithNoArgumentsActionGroup'); } /** @@ -28,7 +28,7 @@ public function testActionGroupWithNoArguments() */ public function testActionGroupWithDefaultArgumentAndStringSelectorParam() { - $this->generateAndCompareTest('ActionGroupWithDefaultArgumentAndStringSelectorParam'); + $this->generateAndCompareTest('ActionGroupWithDefaultArgumentAndStringSelectorParamActionGroup'); } /** @@ -39,7 +39,7 @@ public function testActionGroupWithDefaultArgumentAndStringSelectorParam() */ public function testActionGroupWithPassedArgumentAndStringSelectorParam() { - $this->generateAndCompareTest('ActionGroupWithPassedArgumentAndStringSelectorParam'); + $this->generateAndCompareTest('ActionGroupWithPassedArgumentAndStringSelectorParamActionGroup'); } /** @@ -50,7 +50,7 @@ public function testActionGroupWithPassedArgumentAndStringSelectorParam() */ public function testActionGroupWithSingleParameterSelectorFromDefaultArgument() { - $this->generateAndCompareTest('ActionGroupWithSingleParameterSelectorFromDefaultArgument'); + $this->generateAndCompareTest('ActionGroupWithSingleParameterSelectorFromDefaultArgumentActionGroup'); } /** @@ -61,7 +61,7 @@ public function testActionGroupWithSingleParameterSelectorFromDefaultArgument() */ public function testActionGroupWithSingleParameterSelectorFromPassedArgument() { - $this->generateAndCompareTest('ActionGroupWithSingleParameterSelectorFromPassedArgument'); + $this->generateAndCompareTest('ActionGroupWithSingleParameterSelectorFromPassedArgumentActionGroup'); } /** @@ -72,7 +72,7 @@ public function testActionGroupWithSingleParameterSelectorFromPassedArgument() */ public function testActionGroupWithMultipleParameterSelectorsFromDefaultArgument() { - $this->generateAndCompareTest('ActionGroupWithMultipleParameterSelectorsFromDefaultArgument'); + $this->generateAndCompareTest('ActionGroupWithMultipleParameterSelectorsFromDefaultArgumentActionGroup'); } /** @@ -83,7 +83,7 @@ public function testActionGroupWithMultipleParameterSelectorsFromDefaultArgument */ public function testActionGroupWithSimpleDataUsageFromPassedArgument() { - $this->generateAndCompareTest('ActionGroupWithSimpleDataUsageFromPassedArgument'); + $this->generateAndCompareTest('ActionGroupWithSimpleDataUsageFromPassedArgumentActionGroup'); } /** @@ -94,7 +94,7 @@ public function testActionGroupWithSimpleDataUsageFromPassedArgument() */ public function testActionGroupWithSimpleDataUsageFromDefaultArgument() { - $this->generateAndCompareTest('ActionGroupWithSimpleDataUsageFromDefaultArgument'); + $this->generateAndCompareTest('ActionGroupWithSimpleDataUsageFromDefaultArgumentActionGroup'); } /** @@ -105,7 +105,7 @@ public function testActionGroupWithSimpleDataUsageFromDefaultArgument() */ public function testActionGroupWithStepKeyReferences() { - $this->generateAndCompareTest('ActionGroupWithStepKeyReferences'); + $this->generateAndCompareTest('ActionGroupWithStepKeyReferencesActionGroup'); } /** @@ -116,7 +116,7 @@ public function testActionGroupWithStepKeyReferences() */ public function testActionGroupWithNestedArgument() { - $this->generateAndCompareTest('ActionGroupUsingNestedArgument'); + $this->generateAndCompareTest('ActionGroupUsingNestedArgumentActionGroup'); } /** @@ -127,7 +127,7 @@ public function testActionGroupWithNestedArgument() */ public function testActionGroupWithPersistedAndXmlEntityArguments() { - $this->generateAndCompareTest('PersistedAndXmlEntityArguments'); + $this->generateAndCompareTest('PersistedAndXmlEntityArgumentsActionGroup'); } /** @@ -138,7 +138,7 @@ public function testActionGroupWithPersistedAndXmlEntityArguments() */ public function testActionGroupToExtend() { - $this->generateAndCompareTest('ActionGroupToExtend'); + $this->generateAndCompareTest('ActionGroupToExtendActionGroup'); } /** @@ -149,7 +149,7 @@ public function testActionGroupToExtend() */ public function testExtendedActionGroup() { - $this->generateAndCompareTest('ExtendedActionGroup'); + $this->generateAndCompareTest('ExtendedActionGroupActionGroup'); } /** diff --git a/dev/tests/verification/_suite/functionalSuite.xml b/dev/tests/verification/_suite/functionalSuite.xml index cfdaa3557..20a498405 100644 --- a/dev/tests/verification/_suite/functionalSuite.xml +++ b/dev/tests/verification/_suite/functionalSuite.xml @@ -43,7 +43,7 @@ </createData> <!-- <click stepKey="comment with element" userInput="helloworld"/> --> <click stepKey="clickWithData" userInput="$create.data$"/> - <actionGroup ref="actionGroupWithTwoArguments" stepKey="AC"> + <actionGroup ref="ActionGroupWithTwoArgumentsActionGroup" stepKey="aC"> <!--Comment in AG Args--> <argument name="somePerson" value="simpleData"/> <argument name="anotherPerson" value="uniqueData"/> diff --git a/dev/tests/verification/_suite/functionalSuiteHooks.xml b/dev/tests/verification/_suite/functionalSuiteHooks.xml index f86f8c43c..2107af673 100644 --- a/dev/tests/verification/_suite/functionalSuiteHooks.xml +++ b/dev/tests/verification/_suite/functionalSuiteHooks.xml @@ -17,7 +17,7 @@ <field key="someKey">dataHere</field> </createData> <click stepKey="clickWithData" userInput="$create.data$"/> - <actionGroup ref="actionGroupWithTwoArguments" stepKey="AC"> + <actionGroup ref="ActionGroupWithTwoArgumentsActionGroup" stepKey="aC"> <argument name="somePerson" value="simpleData"/> <argument name="anotherPerson" value="uniqueData"/> </actionGroup> @@ -25,7 +25,7 @@ <after> <amOnPage url="some.url" stepKey="after"/> <deleteData url="deleteThis" stepKey="delete"/> - <actionGroup ref="actionGroupWithTwoArguments" stepKey="AC"> + <actionGroup ref="ActionGroupWithTwoArgumentsActionGroup" stepKey="aC"> <argument name="somePerson" value="simpleData"/> <argument name="anotherPerson" value="uniqueData"/> </actionGroup> diff --git a/docs/credentials.md b/docs/credentials.md index a2850cfe8..2926d043e 100644 --- a/docs/credentials.md +++ b/docs/credentials.md @@ -155,7 +155,7 @@ Define the value as a reference to the corresponding key in the credentials file For example, to reference secret data in the [`fillField`][] action, use the `userInput` attribute using a typical File Storage: ```xml -<fillField stepKey="FillApiToken" selector=".api-token" userInput="{{_CREDS.vendor/my_data_key}}" /> +<fillField stepKey="fillApiToken" selector=".api-token" userInput="{{_CREDS.vendor/my_data_key}}" /> ``` <!-- {% endraw %} --> diff --git a/docs/extending.md b/docs/extending.md index 064ed3208..bdc5ada0f 100644 --- a/docs/extending.md +++ b/docs/extending.md @@ -184,7 +184,7 @@ Modify the action group to use another product. ```xml <actionGroups> - <actionGroup name="CountProductA"> + <actionGroup name="CountProductAActionGroup"> <arguments> <argument name="count" type="string"/> </arguments> @@ -195,7 +195,7 @@ Modify the action group to use another product. </assertCount> </actionGroup> - <actionGroup name="CountProductB" extends="CountProductA"> + <actionGroup name="CountProductBActionGroup" extends="CountProductA> <grabMultiple selector="selectorForProductB" stepKey="grabProducts"/> </actionGroup> </actionGroups> @@ -205,7 +205,7 @@ Modify the action group to use another product. ```xml <actionGroups> - <actionGroup name="CountProductA"> + <actionGroup name="CountProductAActionGroup"> <arguments> <argument name="count" type="string"/> </arguments> @@ -216,7 +216,7 @@ Modify the action group to use another product. </assertCount> </actionGroup> - <actionGroup name="CountProductB"> + <actionGroup name="CountProductBActionGroup"> <arguments> <argument name="count" type="string"/> </arguments> @@ -238,14 +238,14 @@ Add a new test `VerifyProductCount` that asserts the count of products: ```xml <actionGroups> - <actionGroup name="GetProductCount"> + <actionGroup name="GetProductCountActionGroup"> <arguments> <argument name="productSelector" type="string"/> </arguments> <grabMultiple selector="{{productSelector}}" stepKey="grabProducts"/> </actionGroup> - <actionGroup name="VerifyProductCount" extends="GetProductCount"> + <actionGroup name="VerifyProductCountActionGroup" extends="GetProductCount> <arguments> <argument name="count" type="string"/> </arguments> @@ -261,14 +261,14 @@ Add a new test `VerifyProductCount` that asserts the count of products: ```xml <actionGroups> - <actionGroup name="GetProductCount"> + <actionGroup name="GetProductCountActionGroup"> <arguments> <argument name="productSelector" type="string"/> </arguments> <grabMultiple selector="{{productSelector}}" stepKey="grabProducts"/> </actionGroup> - <actionGroup name="VerifyProductCount"> + <actionGroup name="VerifyProductCountActionGroup"> <arguments> <argument name="count" type="string"/> <argument name="productSelector" type="string"/> diff --git a/docs/guides/action-groups.md b/docs/guides/action-groups.md index 30c531e4e..0bd4c3d80 100644 --- a/docs/guides/action-groups.md +++ b/docs/guides/action-groups.md @@ -7,7 +7,7 @@ We strive to write tests using only action groups. Fortunately, we have built up Action groups simplify maintainability by reducing duplication. Because they are re-usable building blocks, odds are that they are already made use of by existing tests in the Magento codebase. This proves their stability through real-world use. Take for example, the action group named `LoginAsAdmin`: ```xml -<actionGroup name="LoginAsAdmin"> +<actionGroup name="LoginAsAdminActionGroup"> <annotations> <description>Login to Backend Admin using provided User Data. PLEASE NOTE: This Action Group does NOT validate that you are Logged In.</description> </annotations> @@ -32,7 +32,7 @@ Imagine if this was not an action group and instead we were to copy and paste th Again using `LoginAsAdmin` as our example, we trim away metadata to clearly reveal that this action group performs 5 actions: ```xml -<actionGroup name="LoginAsAdmin"> +<actionGroup name="LoginAsAdminActionGroup"> ... <amOnPage url="{{AdminLoginPage.url}}" .../> <fillField selector="{{AdminLoginFormSection.username}}" .../> @@ -47,7 +47,7 @@ This works against the standard Magento admin panel login page. Bu imagine we ar We can overcome this by making use of MFTF's extensibility. All we need to do is to provide a "merge" that modifies the existing `LoginAsAdmin` action group. Our merge file will look like: ```xml -<actionGroup name="LoginAsAdmin"> +<actionGroup name="LoginAsAdminActionGroup"> <fillField selector="{{CaptchaSection.captchaInput}}" before="signIn" .../> </actionGroup> ``` @@ -57,7 +57,7 @@ Because the name of this merge is also `LoginAsAdmin`, the two get merged togeth To continue this example, imagine someone else is working on a 'Two-Factor Authentication' extension and they also provide a merge for the `LoginAsAdmin` action group. Their merge looks similar to what we have already seen. The only difference is that this time we fill a different field: ```xml -<actionGroup name="LoginAsAdmin"> +<actionGroup name="LoginAsAdminActionGroup"> <fillField selector="{{TwoFactorSection.twoFactorInput}}" before="signIn" .../> </actionGroup> ``` @@ -65,7 +65,7 @@ To continue this example, imagine someone else is working on a 'Two-Factor Authe Bringing it all together, our resulting `LoginAsAdmin` action group becomes this: ```xml -<actionGroup name="LoginAsAdmin"> +<actionGroup name="LoginAsAdminActionGroup"> ... <amOnPage url="{{AdminLoginPage.url}}" .../> <fillField selector="{{AdminLoginFormSection.username}}" .../> diff --git a/docs/guides/test-isolation.md b/docs/guides/test-isolation.md index 474867ff2..9cac8d987 100644 --- a/docs/guides/test-isolation.md +++ b/docs/guides/test-isolation.md @@ -63,16 +63,16 @@ Other test data can be more difficult to detect, and requires an understanding o ```xml <test name="AdminAddImageForCategoryTest"> <before> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginAsAdmin"/> </before> <after> - <actionGroup ref="DeleteCategory" stepKey="DeleteCategory"> + <actionGroup ref="DeleteCategoryActionGroup" stepKey="deleteCategory"> <argument name="categoryEntity" value="SimpleSubCategory"/> </actionGroup> - <actionGroup ref="logout" stepKey="logout"/> + <actionGroup ref="LogoutActionGroup" stepKey="logout"/> </after> <!-- Go to create a new category with image --> - <actionGroup ref="goToCreateCategoryPage" stepKey="goToCreateCategoryPage"/> + <actionGroup ref="GoToCreateCategoryPageActionGroup" stepKey="goToCreateCategoryPage"/> ... </test> ``` diff --git a/docs/merge_points/extend-action-groups.md b/docs/merge_points/extend-action-groups.md index 95d6cff90..2e60a7944 100644 --- a/docs/merge_points/extend-action-groups.md +++ b/docs/merge_points/extend-action-groups.md @@ -9,7 +9,7 @@ In this example we add a `<click>` command to check the checkbox that our extens <!-- {% raw %} --> ```xml -<actionGroup name="FillAdminSimpleProductForm"> +<actionGroup name="FillAdminSimpleProductFormActionGroup"> <arguments> <argument name="category"/> <argument name="simpleProduct"/> @@ -37,8 +37,8 @@ In this example we add a `<click>` command to check the checkbox that our extens ## File to merge ```xml -<actionGroup name="FillAdminSimpleProductFormWithMyExtension" extends="FillAdminSimpleProductForm"> - <!-- This will be added after the step "fillQuantity" on line 12 in the above test. --> +<actionGroup name="FillAdminSimpleProductFormWithMyExtensionActionGroup" extends="FillAdminSimpleProductForm> + <!-- This will be added after the step ActionGroup"fillQuantity" on line 12 in the above test. --> <click selector="{{MyExtensionSection.myCheckbox}}" stepKey="clickMyCheckbox" after="fillQuantity"/> </actionGroup> ``` @@ -48,7 +48,7 @@ In this example we add a `<click>` command to check the checkbox that our extens Note that there are now two action groups below. ```xml -<actionGroup name="FillAdminSimpleProductForm"> +<actionGroup name="FillAdminSimpleProductFormActionGroup"> <arguments> <argument name="category"/> <argument name="simpleProduct"/> @@ -71,7 +71,7 @@ Note that there are now two action groups below. <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/> <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/> </actionGroup> -<actionGroup name="FillAdminSimpleProductFormWithMyExtension"> +<actionGroup name="FillAdminSimpleProductFormWithMyExtensionActionGroup"> <arguments> <argument name="category"/> <argument name="simpleProduct"/> @@ -99,4 +99,4 @@ Note that there are now two action groups below. </actionGroup> ``` -<!-- {% endraw %} --> \ No newline at end of file +<!-- {% endraw %} --> diff --git a/docs/merge_points/extend-tests.md b/docs/merge_points/extend-tests.md index 6aab50764..ff605861d 100644 --- a/docs/merge_points/extend-tests.md +++ b/docs/merge_points/extend-tests.md @@ -25,16 +25,16 @@ In this example, we add an action group to a new copy of the original test for o <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> </after> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginAsAdmin1"/> + <actionGroup ref="FillAdminSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="simpleProduct" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1"> + <actionGroup ref="AssertProductInStorefrontCategoryPageActionGroup" stepKey="assertProductInStorefront1"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="product" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2"> + <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefront2"> <argument name="product" value="_defaultProduct"/> </actionGroup> </test> @@ -55,12 +55,12 @@ In this example, we add an action group to a new copy of the original test for o <group value="product"/> </annotations> <!-- This will be added after the step "fillProductFieldsInAdmin" on line 20 in the above test. --> - <actionGroup ref="AddMyExtensionData" stepKey="extensionField" after="fillProductFieldsInAdmin"> + <actionGroup ref="AddMyExtensionDataActionGroup" stepKey="extensionField" after="fillProductFieldsInAdmin"> <argument name="extensionData" value="_myData"/> </actionGroup> <!-- This will be added after the step "assertProductInStorefront2" on line 28 in the above test. --> - <actionGroup ref="AssertMyExtensionDataExists" stepKey="assertExtensionInformation" after="assertProductInStorefront2"> + <actionGroup ref="AssertMyExtensionDataExistsActionGroup" stepKey="assertExtensionInformation" after="assertProductInStorefront2"> <argument name="extensionData" value="_myData"/> </actionGroup> </test> @@ -89,16 +89,16 @@ Note that there are now two tests below. <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> </after> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginAsAdmin1"/> + <actionGroup ref="FillAdminSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="simpleProduct" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1"> + <actionGroup ref="AssertProductInStorefrontCategoryPageActionGroup" stepKey="assertProductInStorefront1"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="product" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2"> + <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefront2"> <argument name="product" value="_defaultProduct"/> </actionGroup> </test> @@ -120,25 +120,25 @@ Note that there are now two tests below. <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> </after> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginAsAdmin1"/> + <actionGroup ref="FillAdminSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="simpleProduct" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AddMyExtensionData" stepKey="extensionField"> + <actionGroup ref="AddMyExtensionDataActionGroup" stepKey="extensionField"> <argument name="extensionData" value="_myData"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1"> + <actionGroup ref="AssertProductInStorefrontCategoryPageActionGroup" stepKey="assertProductInStorefront1"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="product" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2"> + <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefront2"> <argument name="product" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertMyExtensionDataExists" stepKey="assertExtensionInformation"> + <actionGroup ref="AssertMyExtensionDataExistsActionGroup" stepKey="assertExtensionInformation"> <argument name="extensionData" value="_myData"/> </actionGroup> </test> diff --git a/docs/merge_points/merge-action-groups.md b/docs/merge_points/merge-action-groups.md index 3a4f70ab1..0bb2531bf 100644 --- a/docs/merge_points/merge-action-groups.md +++ b/docs/merge_points/merge-action-groups.md @@ -10,7 +10,7 @@ In this example we add a `<click>` command to check the checkbox that our extens <!-- {% raw %} --> ```xml -<actionGroup name="FillAdminSimpleProductForm"> +<actionGroup name="FillAdminSimpleProductFormActionGroup"> <arguments> <argument name="category"/> <argument name="simpleProduct"/> @@ -38,7 +38,7 @@ In this example we add a `<click>` command to check the checkbox that our extens ## File to merge ```xml -<actionGroup name="FillAdminSimpleProductForm"> +<actionGroup name="FillAdminSimpleProductFormActionGroup"> <!-- This will be added after the step "fillQuantity" in the above test. --> <click selector="{{MyExtensionSection.myCheckbox}}" stepKey="clickMyCheckbox" after="fillQuantity"/> </actionGroup> @@ -47,7 +47,7 @@ In this example we add a `<click>` command to check the checkbox that our extens ## Resultant test ```xml -<actionGroup name="FillAdminSimpleProductForm"> +<actionGroup name="FillAdminSimpleProductFormActionGroup"> <arguments> <argument name="category"/> <argument name="simpleProduct"/> @@ -75,4 +75,4 @@ In this example we add a `<click>` command to check the checkbox that our extens </actionGroup> ``` -<!-- {% endraw %} --> \ No newline at end of file +<!-- {% endraw %} --> diff --git a/docs/merge_points/merge-tests.md b/docs/merge_points/merge-tests.md index 3958410e9..4a4b82e6b 100644 --- a/docs/merge_points/merge-tests.md +++ b/docs/merge_points/merge-tests.md @@ -25,16 +25,16 @@ In this example we add an action group that modifies the original test to intera <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> </after> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginAsAdmin1"/> + <actionGroup ref="FillAdminSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="simpleProduct" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1"> + <actionGroup ref="AssertProductInStorefrontCategoryPageActionGroup" stepKey="assertProductInStorefront1"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="product" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2"> + <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefront2"> <argument name="product" value="_defaultProduct"/> </actionGroup> </test> @@ -45,12 +45,12 @@ In this example we add an action group that modifies the original test to intera ```xml <test name="AdminCreateSimpleProductTest"> <!-- This will be added after the step "fillProductFieldsInAdmin" in the above test. --> - <actionGroup ref="AddMyExtensionData" stepKey="extensionField" after="fillProductFieldsInAdmin"> + <actionGroup ref="AddMyExtensionDataActionGroup" stepKey="extensionField" after="fillProductFieldsInAdmin"> <argument name="extensionData" value="_myData"/> </actionGroup> <!-- This will be added after the step "assertProductInStorefront2" in the above test. --> - <actionGroup ref="AssertMyExtensionDataExists" stepKey="assertExtensionInformation" after="assertProductInStorefront2"> + <actionGroup ref="AssertMyExtensionDataExistsActionGroup" stepKey="assertExtensionInformation" after="assertProductInStorefront2"> <argument name="extensionData" value="_myData"/> </actionGroup> </test> @@ -77,26 +77,26 @@ In this example we add an action group that modifies the original test to intera <deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/> </after> - <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/> - <actionGroup ref="FillAdminSimpleProductForm" stepKey="fillProductFieldsInAdmin"> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginAsAdmin1"/> + <actionGroup ref="FillAdminSimpleProductFormActionGroup" stepKey="fillProductFieldsInAdmin"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="simpleProduct" value="_defaultProduct"/> </actionGroup> <!-- First merged action group --> - <actionGroup ref="AddMyExtensionData" stepKey="extensionField"> + <actionGroup ref="AddMyExtensionDataActionGroup" stepKey="extensionField"> <argument name="extensionData" value="_myData"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1"> + <actionGroup ref="AssertProductInStorefrontCategoryPageActionGroup" stepKey="assertProductInStorefront1"> <argument name="category" value="$$createPreReqCategory$$"/> <argument name="product" value="_defaultProduct"/> </actionGroup> - <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefront2"> + <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefront2"> <argument name="product" value="_defaultProduct"/> </actionGroup> <!-- Second merged action group --> - <actionGroup ref="AssertMyExtensionDataExists" stepKey="assertExtensionInformation"> + <actionGroup ref="AssertMyExtensionDataExistsActionGroup" stepKey="assertExtensionInformation"> <argument name="extensionData" value="_myData"/> </actionGroup> </test> -``` \ No newline at end of file +``` diff --git a/docs/merging.md b/docs/merging.md index e4b91fb5f..c107f3090 100644 --- a/docs/merging.md +++ b/docs/merging.md @@ -22,7 +22,7 @@ For example: - All pages with `<page name="SamplePage>` will be merged into one. - All sections with `<section name="SampleAction">` will be merged into one. - All data entities with `<entity name="sampleData" type="sample">` will be merged into one. -- All action groups with `<actionGroup name="selectNotLoggedInCustomerGroup">` will be merged into one. +- All action groups with `<actionGroup name="SelectNotLoggedInCustomerGroupActionGroup">` will be merged into one. Although a file name does not influence merging, we recommend using the same file names in merging updates. This makes it easier to search later on. @@ -284,7 +284,7 @@ The controls change drastically in the B2B version, so it was abstracted to an a > Action group for selecting `customerGroup` in the `Cart Price Rules` section: ```xml -<actionGroup name="selectNotLoggedInCustomerGroup"> +<actionGroup name="SelectNotLoggedInCustomerGroupActionGroup"> <selectOption selector="{{AdminCartPriceRulesFormSection.customerGroups}}" userInput="NOT LOGGED IN" stepKey="selectCustomerGroup"/> </actionGroup> ``` @@ -293,7 +293,7 @@ The controls change drastically in the B2B version, so it was abstracted to an a ```xml <!-- name matches --> -<actionGroup name="selectNotLoggedInCustomerGroup"> +<actionGroup name="SelectNotLoggedInCustomerGroupActionGroup"> <!-- removes the original action --> <remove keyForRemoval="selectCustomerGroup"/> <!-- adds in sequence of actions to be performed instead--> diff --git a/docs/section/locator-functions.md b/docs/section/locator-functions.md index d52c2fc72..0074a3c6a 100644 --- a/docs/section/locator-functions.md +++ b/docs/section/locator-functions.md @@ -33,8 +33,8 @@ Given the above element definitions, you call the elements in a test just like a ```xml <test name="LocatorFuctionTest"> - <click selector="{{LocatorFunctionSection.simpleLocator}}" stepKey="SimpleLocator"/> - <click selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', 'string2')}}" stepKey="TwoParamLiteral"/> + <click selector="{{LocatorFunctionSection.simpleLocator}}" stepKey="simpleLocator"/> + <click selector="{{LocatorFunctionSection.simpleLocatorTwoParam('string1', 'string2')}}" stepKey="twoParamLiteral"/> </test> ``` @@ -43,4 +43,4 @@ Given the above element definitions, you call the elements in a test just like a <!-- Link Definitions --> [Locator functions]: http://codeception.com/docs/reference/Locator [section]: ../section.md -[parameterized selectors]: ./parameterized-selectors.md \ No newline at end of file +[parameterized selectors]: ./parameterized-selectors.md diff --git a/docs/suite.md b/docs/suite.md index 38e54926f..761690adf 100644 --- a/docs/suite.md +++ b/docs/suite.md @@ -100,7 +100,7 @@ There are several ways to generate and execute your new test in the context of a <suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Suite/etc/suiteSchema.xsd"> <suite name="WYSIWYG"> <before> - <actionGroup ref="LoginAsAdmin" stepKey="login"/> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="login"/> <amOnPage url="admin/admin/system_config/edit/section/cms/" stepKey="navigateToConfigurationPage" /> <waitForPageLoad stepKey="wait1"/> <conditionalClick stepKey="expandWYSIWYGOptions" selector="{{ContentManagementSection.WYSIWYGOptions}}" dependentSelector="{{ContentManagementSection.CheckIfTabExpand}}" visible="true" /> @@ -112,8 +112,8 @@ There are several ways to generate and execute your new test in the context of a <click selector="{{ContentManagementSection.Save}}" stepKey="saveConfig" /> </before> <after> - <actionGroup ref="LoginAsAdmin" stepKey="login"/> - <actionGroup ref="DisabledWYSIWYG" stepKey="disable"/> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="login"/> + <actionGroup ref="DisabledWYSIWYGActionGroup" stepKey="disable"/> </after> <include> <group name="WYSIWYG"/> diff --git a/docs/test-prep.md b/docs/test-prep.md index b344fcf9f..7cf8b803a 100644 --- a/docs/test-prep.md +++ b/docs/test-prep.md @@ -323,7 +323,7 @@ To create an action group, take the steps and put them within an `<actionGroup>` <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> <!--Fill main fields in create product form--> - <actionGroup name="fillMainProductForm"> + <actionGroup name="FillMainProductFormActionGroup"> <arguments> <argument name="product" defaultValue="_defaultProduct"/> </arguments> @@ -366,7 +366,7 @@ Now we can reference this action group within our test (and any other test). </annotations> <before> <!-- Login to Admin panel --> - <actionGroup ref="LoginAsAdmin" stepKey="loginToAdminPanel" /> + <actionGroup ref="LoginAsAdminActionGroup" stepKey="loginToAdminPanel" /> </before> <after> <!-- Logout from Admin panel --> @@ -377,19 +377,19 @@ Now we can reference this action group within our test (and any other test). <waitForPageLoad stepKey="waitForProductGridPageLoaded" /> <!-- Click "Add Product" button --> - <actionGroup ref="goToCreateProductPage" stepKey="goToCreateProductPage" /> + <actionGroup ref="GoToCreateProductPageActionGroup" stepKey="goToCreateProductPage" /> -----><fillField selector="{{AdminProductFormSection.productName}}" userInput="{{product.name}}" stepKey="fillProductName"/> - <actionGroup ref="fillMainProductForm" stepKey="fillProductForm"> + <actionGroup ref="FillMainProductFormActionGroup" stepKey="fillProductForm"> <argument name="product" value="_defaultProduct" /> </actionGroup> <!-- See success save message "You saved the product." --> - <actionGroup ref="saveProductForm" stepKey="clickSaveOnProductForm" /> + <actionGroup ref="SaveProductFormActionGroup" stepKey="clickSaveOnProductForm" /> <actionGroup ref="AssertProductInGridActionGroup" stepKey="assertProductInGrid" /> <!-- Open Storefront Product Page and verify "Name", "SKU", "Price" --> - <actionGroup ref="AssertProductInStorefrontProductPage" stepKey="assertProductInStorefrontProductPage"> + <actionGroup ref="AssertProductInStorefrontProductPageActionGroup" stepKey="assertProductInStorefrontProductPage"> <argument name="product" value="_defaultProduct" /> </actionGroup> </test> diff --git a/docs/test/action-groups.md b/docs/test/action-groups.md index 5fdfbb522..529fddf71 100644 --- a/docs/test/action-groups.md +++ b/docs/test/action-groups.md @@ -51,7 +51,7 @@ To create the `<actionGroup>` declaration: <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="{Action Group Name}"> + <actionGroup name="{Action Group Name}ActionGroup"> </actionGroup> </actionGroups> @@ -82,7 +82,7 @@ To create the `<actionGroup>` declaration: <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd"> - <actionGroup name="LoginAsAdmin"> + <actionGroup name="LoginAsAdminActionGroup"> <annotations> <description>Login to Backend Admin using provided User Data. PLEASE NOTE: This Action Group does NOT validate that you are Logged In.</description> </annotations> @@ -133,7 +133,7 @@ There are cases when you use a string instead of a whole entity. For example, the following defines the replacement argument `relevantString` using a primitive data type: ```xml -<actionGroup name="fillExample"> +<actionGroup name="FillExampleActionGroup"> <arguments> <argument name="relevantString" defaultValue="defaultString" type="string"/> </arguments> @@ -149,7 +149,7 @@ The `string` argument type provides a method to pass a single piece of data to t ### Explicitly define the argument value ```xml -<actionGroup stepKey="fillWithStringLiteral" ref="fillExample"> +<actionGroup stepKey="fillWithStringLiteral" ref="FillExampleActionGroup"> <argument name="relevantString" value="overrideString"/> </actionGroup> ``` @@ -157,7 +157,7 @@ The `string` argument type provides a method to pass a single piece of data to t ### Use persisted data references to define the argument value ```xml -<actionGroup stepKey="fillWithStringLiteral" ref="fillExample"> +<actionGroup stepKey="fillWithStringLiteral" ref="FillExampleActionGroup"> <argument name="relevantString" value="$persistedData.field1$"/> </actionGroup> ``` @@ -173,7 +173,7 @@ The `field1` data contains the required string. MFTF resolves `{{myCustomEntity.field1}}` the same as it would in a `selector` or `userInput` attribute. ```xml -<actionGroup stepKey="fillWithXmlData" ref="fillExample"> +<actionGroup stepKey="fillWithXmlData" ref="FillExampleActionGroup"> <argument name="relevantString" value="{{myCustomEntity.field1}}"/> </actionGroup> ``` @@ -185,7 +185,7 @@ Structuring properly an action group increases code reusability and readability. Starting with an action group such as: ```xml -<actionGroup name="CreateCategory"> +<actionGroup name="CreateCategoryActionGroup"> <arguments> <argument name="categoryEntity" defaultValue="_defaultCategory"/> </arguments> @@ -205,7 +205,7 @@ Starting with an action group such as: It can be reworked into more manageable pieces, as below. These smaller steps are easier to read, update, and reuse. * GoToCategoryGridAndAddNewCategory ```xml - <actionGroup name="GoToCategoryGridAndAddNewCategory"> + <actionGroup name="GoToCategoryGridAndAddNewCategoryActionGroup"> <seeInCurrentUrl url="{{AdminCategoryPage.url}}" stepKey="seeOnCategoryPage"/> <click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/> <see selector="{{AdminHeaderSection.pageTitle}}" userInput="New Category" stepKey="seeCategoryPageTitle"/> @@ -213,7 +213,7 @@ It can be reworked into more manageable pieces, as below. These smaller steps ar ``` * FillInBasicCategoryFields ```xml - <actionGroup name="FillInBasicCategoryFields"> + <actionGroup name="FillInBasicCategoryFieldsActionGroup"> <arguments> <argument name="categoryEntity" defaultValue="_defaultCategory"/> </arguments> @@ -224,7 +224,7 @@ It can be reworked into more manageable pieces, as below. These smaller steps ar ``` * SaveAndVerifyCategoryCreation ```xml - <actionGroup name="SaveAndVerifyCategoryCreation"> + <actionGroup name="SaveAndVerifyCategoryCreationActionGroup"> <click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="saveCategory"/> <seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccess"/> <seeInTitle userInput="{{categoryEntity.name}}" stepKey="seeNewCategoryPageTitle"/> diff --git a/docs/tips-tricks.md b/docs/tips-tricks.md index a2300c3bf..4e3a0d996 100644 --- a/docs/tips-tricks.md +++ b/docs/tips-tricks.md @@ -21,13 +21,13 @@ Good ```xml <test> - <actionGroup ref="VerifyOptionInProductStorefront" stepKey="verifyConfigurableOption" after="AssertProductInStorefrontProductPage"> + <actionGroup ref="VerifyOptionInProductStorefrontActionGroup" stepKey="verifyConfigurableOption" after="assertProductInStorefrontProductPage"> <argument name="attributeCode" value="$createConfigProductAttribute.default_frontend_label$"/> <argument name="optionName" value="$createConfigProductAttributeOption1.option[store_labels][1][label]$"/> </actionGroup> </test> -<actionGroup name="VerifyOptionInProductStorefront"> +<actionGroup name="VerifyOptionInProductStorefrontActionGroup"> <arguments> <argument name="attributeCode" type="string"/> <argument name="optionName" type="string"/> @@ -70,7 +70,7 @@ Good: <actionGroup ref="AdminDeleteStoreViewActionGroup" stepKey="deleteStoreViewFr"> <argument name="customStore" value="customStoreFR"/> </actionGroup> - <actionGroup ref="logout" stepKey="logout"/> + <actionGroup ref="LogoutActionGroup" stepKey="logout"/> </after> ``` @@ -90,7 +90,7 @@ Bad: <deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/> <magentoCLI command="config:set catalog/frontend/flat_catalog_category 0" stepKey="setFlatCatalogCategory"/> <magentoCLI command="indexer:set-mode" arguments="schedule" stepKey="setIndexerMode"/> - <actionGroup ref="logout" stepKey="logout"/> + <actionGroup ref="LogoutActionGroup" stepKey="logout"/> </after> ``` diff --git a/src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php b/src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php index 6fc9afa55..5953a3338 100644 --- a/src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php +++ b/src/Magento/FunctionalTestingFramework/Console/DoctorCommand.php @@ -138,6 +138,7 @@ private function checkAuthenticationToMagentoAdmin() $e->getMessage() . "\nPlease verify if " . $urlVar . ", " . "MAGENTO_ADMIN_USERNAME and MAGENTO_ADMIN_PASSWORD in .env are valid." ); + $this->ioStyle->comment('Context: '.print_r($e->getContext(), true)); } return $result; }