Skip to content

Commit 19def8a

Browse files
tomreecetomreece
committed
MQE-523: Create mainline PRs for previous sprint (12)
- Fix Alex's feedback
1 parent 6d28b21 commit 19def8a

20 files changed

+90
-91
lines changed

‎dev/_suite/functionalSuite.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@
1010
<suite name="functionalSuite1">
1111
<include>
1212
<group name="include"/>
13-
<cest name="sampleSuiteCest" test="includeTest"/>
14-
<cest name="sampleSuite4Cest"/>
13+
<cest name="SampleSuiteCest" test="IncludeTest"/>
14+
<cest name="SampleSuite4Cest"/>
1515
</include>
1616
<exclude>
1717
<group name="exclude"/>
18-
<cest name="sampleSuite5Cest" test="excludeTest"/>
18+
<cest name="SampleSuite5Cest" test="ExcludeTest"/>
1919
</exclude>
2020
</suite>
21-
</suites>
21+
</suites>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ class ActionGroupFunctionalCest
3131
public function _before(AcceptanceTester $I)
3232
{
3333
$I->amGoingTo("create entity that has the mergeKey: createPersonParam");
34-
$replacementPerson = DataObjectHandler::getInstance()->getObject("replacementPerson");
35-
$this->createPersonParam = new DataPersistenceHandler($replacementPerson);
34+
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
35+
$this->createPersonParam = new DataPersistenceHandler($ReplacementPerson);
3636
$this->createPersonParam->createEntity();
3737
}
3838

@@ -103,8 +103,8 @@ class ActionGroupFunctionalCest
103103
public function ActionGroupWithPersistedData(AcceptanceTester $I)
104104
{
105105
$I->amGoingTo("create entity that has the mergeKey: createPerson");
106-
$defaultPerson = DataObjectHandler::getInstance()->getObject("defaultPerson");
107-
$createPerson = new DataPersistenceHandler($defaultPerson);
106+
$DefaultPerson = DataObjectHandler::getInstance()->getObject("DefaultPerson");
107+
$createPerson = new DataPersistenceHandler($DefaultPerson);
108108
$createPerson->createEntity();
109109
$I->amOnPage("/" . $createPerson->getCreatedDataByName('firstname') . "/" . $createPerson->getCreatedDataByName('lastname') . ".html");
110110
$I->fillField("#foo", $createPerson->getCreatedDataByName('firstname'));

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ class PersistedReplacementCest
2626
public function _before(AcceptanceTester $I)
2727
{
2828
$I->amGoingTo("create entity that has the mergeKey: createData1");
29-
$replacementPerson = DataObjectHandler::getInstance()->getObject("replacementPerson");
30-
$this->createData1 = new DataPersistenceHandler($replacementPerson);
29+
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
30+
$this->createData1 = new DataPersistenceHandler($ReplacementPerson);
3131
$this->createData1->createEntity();
3232
}
3333

@@ -39,12 +39,12 @@ class PersistedReplacementCest
3939
public function PersistedReplacementTest(AcceptanceTester $I)
4040
{
4141
$I->amGoingTo("create entity that has the mergeKey: testScopeData");
42-
$replacementPerson = DataObjectHandler::getInstance()->getObject("replacementPerson");
43-
$testScopeData = new DataPersistenceHandler($replacementPerson);
42+
$ReplacementPerson = DataObjectHandler::getInstance()->getObject("ReplacementPerson");
43+
$testScopeData = new DataPersistenceHandler($ReplacementPerson);
4444
$testScopeData->createEntity();
4545
$I->amGoingTo("create entity that has the mergeKey: uniqueData");
46-
$uniquePerson = DataObjectHandler::getInstance()->getObject("uniquePerson");
47-
$uniqueData = new DataPersistenceHandler($uniquePerson);
46+
$UniquePerson = DataObjectHandler::getInstance()->getObject("UniquePerson");
47+
$uniqueData = new DataPersistenceHandler($UniquePerson);
4848
$uniqueData->createEntity();
4949
$I->amOnPage("/success/success2.html");
5050
$I->amOnPage($testScopeData->getCreatedDataByName('firstname') . ".html");

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dev/tests/verification/_generated/functionalSuite1/sampleSuite3Cest.php:includeTest
2-
dev/tests/verification/_generated/functionalSuite1/sampleSuite5Cest.php:additionalTest
3-
dev/tests/verification/_generated/functionalSuite1/sampleSuiteCest.php:includeTest
4-
dev/tests/verification/_generated/functionalSuite1/sampleSuite4Cest.php:includeTest
1+
dev/tests/verification/_generated/functionalSuite1/SampleSuite3Cest.php:IncludeTest
2+
dev/tests/verification/_generated/functionalSuite1/SampleSuite5Cest.php:additionalTest
3+
dev/tests/verification/_generated/functionalSuite1/SampleSuiteCest.php:IncludeTest
4+
dev/tests/verification/_generated/functionalSuite1/SampleSuite4Cest.php:IncludeTest

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,29 +8,29 @@
88

99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11-
<actionGroup name="functionalActionGroup">
11+
<actionGroup name="FunctionalActionGroup">
1212
<fillField selector="#foo" userInput="myData1" mergeKey="fillField1"/>
1313
<fillField selector="#bar" userInput="myData2" mergeKey="fillField2"/>
1414
</actionGroup>
15-
<actionGroup name="functionalActionGroupWithData">
15+
<actionGroup name="FunctionalActionGroupWithData">
1616
<arguments>
17-
<argument name="person" defaultValue="defaultPerson"/>
17+
<argument name="person" defaultValue="DefaultPerson"/>
1818
</arguments>
1919
<amOnPage url="{{SamplePage.url(person.firstname,person.lastname)}}" mergeKey="amOnPage1"/>
2020
<fillField selector="#foo" userInput="{{person.firstname}}" mergeKey="fillField1"/>
2121
<fillField selector="#bar" userInput="{{person.lastname}}" mergeKey="fillField2"/>
2222
<searchAndMultiSelectOption selector="#foo" parameterArray="[{{person.firstname}}, {{person.lastname}}]" mergeKey="multi1"/>
2323
<see selector="{{SampleSection.oneParamElement(person.firstname)}}" mergeKey="see1"/>
2424
</actionGroup>
25-
<actionGroup name="functionalActionGroupNoDefault">
25+
<actionGroup name="FunctionalActionGroupNoDefault">
2626
<arguments>
2727
<argument name="person"/>
2828
</arguments>
2929
<fillField selector="#foo" userInput="{{person.firstname}}" mergeKey="fillField1"/>
3030
<fillField selector="#bar" userInput="{{person.lastname}}" mergeKey="fillField2"/>
3131
<see selector="{{SampleSection.twoParamElement(person.firstname,person.lastname)}}" mergeKey="see2"/>
3232
</actionGroup>
33-
<actionGroup name="functionalActionGroupForMerge">
33+
<actionGroup name="FunctionalActionGroupForMerge">
3434
<arguments>
3535
<argument name="myArg"/>
3636
</arguments>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11-
<actionGroup name="functionalActionGroupForMerge">
11+
<actionGroup name="FunctionalActionGroupForMerge">
1212
<see mergeKey="myMergedSeeElement" selector=".merge .{{myArg.firstname}}" before="see1"/>
1313
<click mergeKey="myMergedClick" selector=".merge .{{myArg.lastname}}" after="amOnPage1"/>
1414
<fillField mergeKey="deleteMe" remove="true"/>
1515
</actionGroup>
16-
</config>
16+
</config>

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,55 +17,55 @@
1717
<stories value="MQE-433"/>
1818
</annotations>
1919
<before>
20-
<createData entity="replacementPerson" mergeKey="createPersonParam"/>
20+
<createData entity="ReplacementPerson" mergeKey="createPersonParam"/>
2121
</before>
2222
<test name="BasicActionGroupTest">
2323
<amOnPage mergeKey="step1" url="/someUrl"/>
24-
<actionGroup ref="functionalActionGroup" mergeKey="actionGroup1"/>
24+
<actionGroup ref="FunctionalActionGroup" mergeKey="actionGroup1"/>
2525
<click mergeKey="step6" selector="loginButton"/>
2626
</test>
2727
<test name="ActionGroupWithDataTest">
2828
<amOnPage mergeKey="step1" url="/someUrl"/>
29-
<actionGroup ref="functionalActionGroupWithData" mergeKey="actionGroupWithData1"/>
29+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithData1"/>
3030
<click mergeKey="step6" selector="loginButton"/>
3131
</test>
3232
<test name="ActionGroupWithDataOverrideTest">
3333
<amOnPage mergeKey="step1" url="/someUrl"/>
34-
<actionGroup ref="functionalActionGroupWithData" mergeKey="actionGroupWithDataOverride1">
35-
<argument name="person" value="replacementPerson"/>
34+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithDataOverride1">
35+
<argument name="person" value="ReplacementPerson"/>
3636
</actionGroup>
3737
<click mergeKey="step6" selector="loginButton"/>
3838
</test>
3939
<test name="ActionGroupWithNoDefaultTest">
4040
<amOnPage mergeKey="step1" url="/someUrl"/>
41-
<actionGroup ref="functionalActionGroupNoDefault" mergeKey="actionGroupWithDataOverride1">
42-
<argument name="person" value="defaultPerson"/>
41+
<actionGroup ref="FunctionalActionGroupNoDefault" mergeKey="actionGroupWithDataOverride1">
42+
<argument name="person" value="DefaultPerson"/>
4343
</actionGroup>
4444
<click mergeKey="step6" selector="loginButton"/>
4545
</test>
4646
<test name="ActionGroupWithPersistedData">
47-
<createData entity="defaultPerson" mergeKey="createPerson"/>
48-
<actionGroup ref="functionalActionGroupWithData" mergeKey="actionGroupWithPersistedData1">
47+
<createData entity="DefaultPerson" mergeKey="createPerson"/>
48+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithPersistedData1">
4949
<argument name="person" value="$createPerson$"/>
5050
</actionGroup>
5151
</test>
5252
<test name="ActionGroupWithTopLevelPersistedData">
53-
<actionGroup ref="functionalActionGroupWithData" mergeKey="actionGroupWithPersistedData1">
53+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithPersistedData1">
5454
<argument name="person" value="$$createPersonParam$$"/>
5555
</actionGroup>
5656
</test>
5757
<test name="MultipleActionGroupsTest">
5858
<amOnPage mergeKey="step1" url="/someUrl"/>
59-
<actionGroup ref="functionalActionGroupWithData" mergeKey="actionGroup1"/>
59+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroup1"/>
6060
<click mergeKey="step6" selector="loginButton"/>
61-
<actionGroup ref="functionalActionGroupWithData" mergeKey="actionGroupWithDataOverride2">
62-
<argument name="person" value="replacementPerson"/>
61+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="actionGroupWithDataOverride2">
62+
<argument name="person" value="ReplacementPerson"/>
6363
</actionGroup>
6464
</test>
6565
<test name="MergedActionGroupTest">
66-
<actionGroup ref="functionalActionGroupForMerge" mergeKey="actionGroupForMerge">
67-
<argument name="myArg" value="defaultPerson"/>
66+
<actionGroup ref="FunctionalActionGroupForMerge" mergeKey="actionGroupForMerge">
67+
<argument name="myArg" value="DefaultPerson"/>
6868
</actionGroup>
6969
</test>
7070
</cest>
71-
</config>
71+
</config>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<click mergeKey="step6" selector=".step6"/>
3030
</test>
3131
<test name="MergedReferencesTest">
32-
<fillField mergeKey="fillField1" selector="{{SampleSection.mergeElement}}" userInput="{{defaultPerson.mergedField}}"/>
33-
<fillField mergeKey="fillField2" selector="{{SampleSection.newElement}}" userInput="{{defaultPerson.newField}}" />
32+
<fillField mergeKey="fillField1" selector="{{SampleSection.mergeElement}}" userInput="{{DefaultPerson.mergedField}}"/>
33+
<fillField mergeKey="fillField2" selector="{{SampleSection.newElement}}" userInput="{{DefaultPerson.newField}}" />
3434
</test>
3535
</cest>
36-
</config>
36+
</config>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<amOnPage url="/afterUrl1" mergeKey="after1"/>
2020
</after>
2121
<test name="BasicMergeTest">
22-
<click mergeKey="step7Merge" selector="{{SampleSection.oneParamElement(defaultPerson.firstname)}} .step7Merge" after="step6Merge"/>
22+
<click mergeKey="step7Merge" selector="{{SampleSection.oneParamElement(DefaultPerson.firstname)}} .step7Merge" after="step6Merge"/>
2323
<click mergeKey="step2" selector="#step2" after="step1"/>
2424
<click mergeKey="step4" selector="#step4" before="step5"/>
2525
<click mergeKey="step6" remove="true"/>
2626
<click mergeKey="step6Merge" selector="#step6Merged" after="step5"/>
27-
<actionGroup ref="functionalActionGroupWithData" mergeKey="step8Merge" after="step7Merge"/>
27+
<actionGroup ref="FunctionalActionGroupWithData" mergeKey="step8Merge" after="step7Merge"/>
2828
</test>
2929
</cest>
30-
</config>
30+
</config>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
1111
<cest name="PersistedReplacementCest">
1212
<before>
13-
<createData entity="replacementPerson" mergeKey="createData1"/>
13+
<createData entity="ReplacementPerson" mergeKey="createData1"/>
1414
</before>
1515
<test name="PersistedReplacementTest">
16-
<createData entity="replacementPerson" mergeKey="testScopeData"/>
17-
<createData entity="uniquePerson" mergeKey="uniqueData"/>
16+
<createData entity="ReplacementPerson" mergeKey="testScopeData"/>
17+
<createData entity="UniquePerson" mergeKey="uniqueData"/>
1818

1919
<!-- parameterized url that uses literal params -->
2020
<amOnPage url="{{SamplePage.url('success','success2')}}" mergeKey="a0"/>
@@ -34,7 +34,7 @@
3434
<click selector="{{SampleSection.twoParamElement($testScopeData.firstname$,'success')}}" mergeKey="c2"/>
3535

3636
<!-- parameterized selector with literal, static data, and created data -->
37-
<click selector="{{SampleSection.threeParamElement('John', replacementPerson.lastname, $testScopeData.lastname$)}}"
37+
<click selector="{{SampleSection.threeParamElement('John', ReplacementPerson.lastname, $testScopeData.lastname$)}}"
3838
mergeKey="c3"/>
3939

4040
<!-- selector that uses created data -->
@@ -64,4 +64,4 @@
6464

6565
</test>
6666
</cest>
67-
</config>
67+
</config>

0 commit comments

Comments
 (0)