Skip to content

Commit 2c70363

Browse files
jilu1jilu1
committed
Merge branch 'MQE-541' into sprint-develop
# Conflicts: # dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml # dev/tests/verification/TestModule/Cest/MergeInFunctionalCest.xml # etc/di.xml # src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
2 parents 81c8690 + febae80 commit 2c70363

38 files changed

+546
-760
lines changed

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Objects/ActionObjectTest.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class ActionObjectTest extends TestCase
2727
*/
2828
public function testConstructOrderBefore()
2929
{
30-
$actionObject = new ActionObject('mergeKey', 'type', [], null, 'before');
30+
$actionObject = new ActionObject('stepKey', 'type', [], null, 'before');
3131
$this->assertEquals(0, $actionObject->getOrderOffset());
3232
}
3333

@@ -36,7 +36,7 @@ public function testConstructOrderBefore()
3636
*/
3737
public function testConstructOrderAfter()
3838
{
39-
$actionObject = new ActionObject('mergeKey', 'type', [], null, 'after');
39+
$actionObject = new ActionObject('stepKey', 'type', [], null, 'after');
4040
$this->assertEquals(1, $actionObject->getOrderOffset());
4141
}
4242

‎dev/tests/unit/Magento/FunctionalTestFramework/Test/Util/ActionMergeUtilTest.php

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,39 +32,39 @@ public function testResolveActionStepOrdering()
3232
$testObjNamePosAfterEnd = 'testAfterAfterMerge10';
3333

3434
for ($i = 1; $i < $actionsLength; $i++) {
35-
$mergeKey = 'mergeKey'. $i;
35+
$stepKey = 'stepKey'. $i;
3636
$type = 'testType';
3737
$actionAttributes = [];
3838

39-
$actions[] = new ActionObject($mergeKey, $type, $actionAttributes);
39+
$actions[] = new ActionObject($stepKey, $type, $actionAttributes);
4040
}
4141

4242
$actions[] = new ActionObject(
4343
$testObjNamePosAfterEnd,
44-
'mergeType',
44+
'stepType',
4545
[],
4646
$testObjNamePosEnd,
4747
ActionObject::MERGE_ACTION_ORDER_AFTER
4848
);
4949
$actions[] = new ActionObject(
5050
$testObjNamePosBeforeFirst,
51-
'mergeType',
51+
'stepType',
5252
[],
5353
$testObjNamePosFirst,
5454
ActionObjectExtractor::TEST_ACTION_BEFORE
5555
);
5656
$actions[] = new ActionObject(
5757
$testObjNamePosFirst,
58-
'mergeType',
58+
'stepType',
5959
[],
60-
'mergeKey1',
60+
'stepKey1',
6161
ActionObjectExtractor::TEST_ACTION_BEFORE
6262
);
6363
$actions[] = new ActionObject(
6464
$testObjNamePosEnd,
65-
'mergeType',
65+
'stepType',
6666
[],
67-
'mergeKey' . (string)($actionsLength - 1),
67+
'stepKey' . (string)($actionsLength - 1),
6868
ActionObject::MERGE_ACTION_ORDER_AFTER
6969
);
7070

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class ActionGroupFunctionalCest
3131

3232
public function _before(AcceptanceTester $I)
3333
{
34-
$I->amGoingTo("create entity that has the mergeKey: createPersonParam");
34+
$I->amGoingTo("create entity that has the stepKey: createPersonParam");
3535
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3636
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson);
3737
$this->createPersonParam->createEntity();
@@ -111,7 +111,7 @@ class ActionGroupFunctionalCest
111111
*/
112112
public function ActionGroupWithPersistedData(AcceptanceTester $I)
113113
{
114-
$I->amGoingTo("create entity that has the mergeKey: createPerson");
114+
$I->amGoingTo("create entity that has the stepKey: createPerson");
115115
$DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson");
116116
$createPerson = new DataPersistenceHandler($DefaultPerson);
117117
$createPerson->createEntity();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class AssertCest
2626

2727
public function _before(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: createData1");
29+
$I->amGoingTo("create entity that has the stepKey: createData1");
3030
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3131
$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
3232
$this->createData1->createEntity();
@@ -39,7 +39,7 @@ class AssertCest
3939
*/
4040
public function AssertTest(AcceptanceTester $I)
4141
{
42-
$I->amGoingTo("create entity that has the mergeKey: createData2");
42+
$I->amGoingTo("create entity that has the stepKey: createData2");
4343
$UniquePerson = DataObjectHandler::getInstance()->getObject("UniquePerson");
4444
$createData2 = new DataPersistenceHandler($UniquePerson);
4545
$createData2->createEntity();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class LocatorFunctionCest
2626
*/
2727
public function LocatorFuctionTest(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: data");
29+
$I->amGoingTo("create entity that has the stepKey: data");
3030
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3131
$data = new DataPersistenceHandler($ReplacementPerson);
3232
$data->createEntity();

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class MergeFunctionalCest
5454
$I->fillField("#bar", "Dane");
5555
$I->searchAndMultiSelectOption("#foo", ["Jane", "Dane"]);
5656
$I->see("#element .Jane");
57+
$I->click("#step10MergedInResult");
5758
}
5859

5960
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PageReplacementCest
2626
*/
2727
public function PageReplacementTest(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: datakey");
29+
$I->amGoingTo("create entity that has the stepKey: datakey");
3030
$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
3131
$datakey = new DataPersistenceHandler($simpleData);
3232
$datakey->createEntity();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class ParameterArrayCest
2626
*/
2727
public function ParameterArrayTest(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: simpleDataKey");
29+
$I->amGoingTo("create entity that has the stepKey: simpleDataKey");
3030
$simpleParamData = DataObjectHandler::getInstance()->getObject("simpleParamData");
3131
$simpleDataKey = new DataPersistenceHandler($simpleParamData);
3232
$simpleDataKey->createEntity();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class PersistedReplacementCest
2626

2727
public function _before(AcceptanceTester $I)
2828
{
29-
$I->amGoingTo("create entity that has the mergeKey: createData1");
29+
$I->amGoingTo("create entity that has the stepKey: createData1");
3030
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
3131
$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
3232
$this->createData1->createEntity();
@@ -39,7 +39,7 @@ class PersistedReplacementCest
3939
*/
4040
public function PersistedReplacementTest(AcceptanceTester $I)
4141
{
42-
$I->amGoingTo("create entity that has the mergeKey: createdData");
42+
$I->amGoingTo("create entity that has the stepKey: createdData");
4343
$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
4444
$createdData = new DataPersistenceHandler($simpleData);
4545
$createdData->createEntity();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class SectionReplacementCest
4545
$I->click("#Doe".msq("uniqueData")." .stringLiteral2");
4646
$I->click("#Doe".msq("uniqueData")."-stringLiteral2 .stringLiteral3");
4747
$I->click("#Doe".msq("uniqueData")."-stringLiteral2 .Doe");
48-
$I->amGoingTo("create entity that has the mergeKey: createdData");
48+
$I->amGoingTo("create entity that has the stepKey: createdData");
4949
$simpleData = DataObjectHandler::getInstance()->getObject("simpleData");
5050
$createdData = new DataPersistenceHandler($simpleData);
5151
$createdData->createEntity();

‎dev/tests/verification/TestModule/ActionGroup/FunctionalActionGroup.xml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,40 +9,40 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<actionGroup name="FunctionalActionGroup">
12-
<fillField selector="#foo" userInput="myData1" mergeKey="fillField1"/>
13-
<fillField selector="#bar" userInput="myData2" mergeKey="fillField2"/>
12+
<fillField selector="#foo" userInput="myData1" stepKey="fillField1"/>
13+
<fillField selector="#bar" userInput="myData2" stepKey="fillField2"/>
1414
</actionGroup>
1515
<actionGroup name="FunctionalActionGroupWithData">
1616
<arguments>
1717
<argument name="person" defaultValue="DefaultPerson"/>
1818
</arguments>
19-
<amOnPage url="{{SamplePage.url(person.firstname,person.lastname)}}" mergeKey="amOnPage1"/>
20-
<fillField selector="#foo" userInput="{{person.firstname}}" mergeKey="fillField1"/>
21-
<fillField selector="#bar" userInput="{{person.lastname}}" mergeKey="fillField2"/>
22-
<searchAndMultiSelectOption selector="#foo" parameterArray="[{{person.firstname}}, {{person.lastname}}]" mergeKey="multi1"/>
23-
<see selector="{{SampleSection.oneParamElement(person.firstname)}}" mergeKey="see1"/>
19+
<amOnPage url="{{SamplePage.url(person.firstname,person.lastname)}}" stepKey="amOnPage1"/>
20+
<fillField selector="#foo" userInput="{{person.firstname}}" stepKey="fillField1"/>
21+
<fillField selector="#bar" userInput="{{person.lastname}}" stepKey="fillField2"/>
22+
<searchAndMultiSelectOption selector="#foo" parameterArray="[{{person.firstname}}, {{person.lastname}}]" stepKey="multi1"/>
23+
<see selector="{{SampleSection.oneParamElement(person.firstname)}}" stepKey="see1"/>
2424
</actionGroup>
2525
<actionGroup name="FunctionalActionGroupNoDefault">
2626
<arguments>
2727
<argument name="person"/>
2828
</arguments>
29-
<fillField selector="#foo" userInput="{{person.firstname}}" mergeKey="fillField1"/>
30-
<fillField selector="#bar" userInput="{{person.lastname}}" mergeKey="fillField2"/>
31-
<see selector="{{SampleSection.twoParamElement(person.firstname,person.lastname)}}" mergeKey="see2"/>
29+
<fillField selector="#foo" userInput="{{person.firstname}}" stepKey="fillField1"/>
30+
<fillField selector="#bar" userInput="{{person.lastname}}" stepKey="fillField2"/>
31+
<see selector="{{SampleSection.twoParamElement(person.firstname,person.lastname)}}" stepKey="see2"/>
3232
</actionGroup>
3333
<actionGroup name="FunctionalActionGroupForMerge">
3434
<arguments>
3535
<argument name="myArg"/>
3636
</arguments>
37-
<fillField mergeKey="deleteMe" userInput="Please delete me" selector="#delete" />
38-
<see selector="{{SampleSection.oneParamElement(myArg.firstname)}}" mergeKey="see1"/>
39-
<amOnPage url="{{SamplePage.url(myArg.firstname,myArg.lastname)}}" mergeKey="amOnPage1"/>
37+
<fillField stepKey="deleteMe" userInput="Please delete me" selector="#delete" />
38+
<see selector="{{SampleSection.oneParamElement(myArg.firstname)}}" stepKey="see1"/>
39+
<amOnPage url="{{SamplePage.url(myArg.firstname,myArg.lastname)}}" stepKey="amOnPage1"/>
4040
</actionGroup>
4141
<actionGroup name="FunctionalActionGroupWithTrickyArgument">
4242
<arguments>
4343
<argument name="simple" defaultValue="simpleData"/>
4444
</arguments>
45-
<seeElement mergeKey="see1" selector="{{SampleSection.simpleElement}}"/>
46-
<seeElement mergeKey="see2" selector="{{SampleSection.simpleElementOneParam(simple.firstname)}}"/>
45+
<seeElement stepKey="see1" selector="{{SampleSection.simpleElement}}"/>
46+
<seeElement stepKey="see2" selector="{{SampleSection.simpleElementOneParam(simple.firstname)}}"/>
4747
</actionGroup>
4848
</config>

‎dev/tests/verification/TestModule/ActionGroup/MergeFunctionalActionGroup.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<actionGroup name="FunctionalActionGroupForMerge">
12-
<see mergeKey="myMergedSeeElement" selector=".merge .{{myArg.firstname}}" before="see1"/>
13-
<click mergeKey="myMergedClick" selector=".merge .{{myArg.lastname}}" after="amOnPage1"/>
12+
<see stepKey="myMergedSeeElement" selector=".merge .{{myArg.firstname}}" before="see1"/>
13+
<click stepKey="myMergedClick" selector=".merge .{{myArg.lastname}}" after="amOnPage1"/>
1414
<remove keyForRemoval="deleteMe"/>
1515
</actionGroup>
1616
</config>

‎dev/tests/verification/TestModule/Cest/ActionGroupFunctionalCest.xml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -17,62 +17,62 @@
1717
<stories value="MQE-433"/>
1818
</annotations>
1919
<before>
20-
<createData entity="ReplacementPerson" mergeKey="createPersonParam"/>
21-
<actionGroup ref="FunctionalActionGroup" mergeKey="beforeGroup"/>
20+
<createData entity="ReplacementPerson" stepKey="createPersonParam"/>
21+
<actionGroup ref="FunctionalActionGroup" stepKey="beforeGroup"/>
2222
</before>
2323
<test name="BasicActionGroupTest">
24-
<amOnPage mergeKey="step1" url="/someUrl"/>
25-
<actionGroup ref="FunctionalActionGroup" mergeKey="actionGroup1"/>
26-
<click mergeKey="step6" selector="loginButton"/>
24+
<amOnPage stepKey="step1" url="/someUrl"/>
25+
<actionGroup ref="FunctionalActionGroup" stepKey="actionGroup1"/>
26+
<click stepKey="step6" selector="loginButton"/>
2727
</test>
2828
<test name="ActionGroupWithDataTest">
29-
<amOnPage mergeKey="step1" url="/someUrl"/>
30-
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithData1"/>
31-
<click mergeKey="step6" selector="loginButton"/>
29+
<amOnPage stepKey="step1" url="/someUrl"/>
30+
<actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroupWithData1"/>
31+
<click stepKey="step6" selector="loginButton"/>
3232
</test>
3333
<test name="ActionGroupWithDataOverrideTest">
34-
<amOnPage mergeKey="step1" url="/someUrl"/>
35-
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithDataOverride1">
34+
<amOnPage stepKey="step1" url="/someUrl"/>
35+
<actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroupWithDataOverride1">
3636
<argument name="person" value="ReplacementPerson"/>
3737
</actionGroup>
38-
<click mergeKey="step6" selector="loginButton"/>
38+
<click stepKey="step6" selector="loginButton"/>
3939
</test>
4040
<test name="ActionGroupWithNoDefaultTest">
41-
<amOnPage mergeKey="step1" url="/someUrl"/>
42-
<actionGroup ref="FunctionalActionGroupNoDefault" mergeKey="actionGroupWithDataOverride1">
41+
<amOnPage stepKey="step1" url="/someUrl"/>
42+
<actionGroup ref="FunctionalActionGroupNoDefault" stepKey="actionGroupWithDataOverride1">
4343
<argument name="person" value="DefaultPerson"/>
4444
</actionGroup>
45-
<click mergeKey="step6" selector="loginButton"/>
45+
<click stepKey="step6" selector="loginButton"/>
4646
</test>
4747
<test name="ActionGroupWithPersistedData">
48-
<createData entity="DefaultPerson" mergeKey="createPerson"/>
49-
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithPersistedData1">
48+
<createData entity="DefaultPerson" stepKey="createPerson"/>
49+
<actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroupWithPersistedData1">
5050
<argument name="person" value="$createPerson$"/>
5151
</actionGroup>
5252
</test>
5353
<test name="ActionGroupWithTopLevelPersistedData">
54-
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithPersistedData1">
54+
<actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroupWithPersistedData1">
5555
<argument name="person" value="$$createPersonParam$$"/>
5656
</actionGroup>
5757
</test>
5858
<test name="MultipleActionGroupsTest">
59-
<amOnPage mergeKey="step1" url="/someUrl"/>
60-
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroup1"/>
61-
<click mergeKey="step6" selector="loginButton"/>
62-
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithDataOverride2">
59+
<amOnPage stepKey="step1" url="/someUrl"/>
60+
<actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroup1"/>
61+
<click stepKey="step6" selector="loginButton"/>
62+
<actionGroup ref="FunctionalActionGroupWithData" stepKey="actionGroupWithDataOverride2">
6363
<argument name="person" value="ReplacementPerson"/>
6464
</actionGroup>
6565
</test>
6666
<test name="MergedActionGroupTest">
67-
<actionGroup ref="FunctionalActionGroupForMerge" mergeKey="actionGroupForMerge">
67+
<actionGroup ref="FunctionalActionGroupForMerge" stepKey="actionGroupForMerge">
6868
<argument name="myArg" value="DefaultPerson"/>
6969
</actionGroup>
7070
</test>
7171
<test name="ArgumentWithSameNameAsElement">
72-
<actionGroup ref="FunctionalActionGroupWithTrickyArgument" mergeKey="actionGroup1"/>
72+
<actionGroup ref="FunctionalActionGroupWithTrickyArgument" stepKey="actionGroup1"/>
7373
</test>
7474
<after>
75-
<actionGroup ref="FunctionalActionGroup" mergeKey="afterGroup"/>
75+
<actionGroup ref="FunctionalActionGroup" stepKey="afterGroup"/>
7676
</after>
7777
</cest>
7878
</config>

0 commit comments

Comments
 (0)