Skip to content

Commit ffe41c6

Browse files
tomreecetomreece
committed
MQE-519: [Patch] Tests for ActionGroup with parametrized arguments
- Tweak original patch to match new MFTF changes that occurred after the patch was given to us
1 parent cf32b07 commit ffe41c6

File tree

5 files changed

+27
-23
lines changed

5 files changed

+27
-23
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ use Magento\FunctionalTestingFramework\AcceptanceTester;
55
use Magento\FunctionalTestingFramework\DataGenerator\Handlers\DataObjectHandler;
66
use Magento\FunctionalTestingFramework\DataGenerator\Persist\DataPersistenceHandler;
77
use Magento\FunctionalTestingFramework\DataGenerator\Objects\EntityDataObject;
8+
use \Codeception\Util\Locator;
89
use Yandex\Allure\Adapter\Annotation\Features;
910
use Yandex\Allure\Adapter\Annotation\Stories;
1011
use Yandex\Allure\Adapter\Annotation\Title;
@@ -16,7 +17,7 @@ use Yandex\Allure\Adapter\Annotation\TestCaseId;
1617

1718
/**
1819
* @Severity(level = SeverityLevel::CRITICAL)
19-
* @Title("Title")
20+
* @Title("Action Group Cest")
2021
* @group functional
2122
* @Features({"Action Group"})
2223
* @Stories({"MQE-496"})
@@ -56,7 +57,7 @@ class ActionGroupCest
5657
*/
5758
public function actionGroupWithPassedArgumentAndStringSelectorParam(AcceptanceTester $I)
5859
{
59-
$I->see("John".msq("uniquePerson"), "#element .test1");
60+
$I->see("John".msq("UniquePerson"), "#element .test1");
6061
}
6162

6263
/**
@@ -80,7 +81,7 @@ class ActionGroupCest
8081
*/
8182
public function actionGroupWithSingleParameterSelectorFromPassedArgument(AcceptanceTester $I)
8283
{
83-
$I->see("Doe", "#element .John".msq("uniquePerson"));
84+
$I->see("Doe", "#element .John".msq("UniquePerson"));
8485
}
8586

8687
/**

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,37 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
28
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
39
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
410
<actionGroup name="actionGroupWithoutArguments">
5-
<wait time="1" mergeKey="waitForNothing" />
11+
<wait time="1" stepKey="waitForNothing" />
612
</actionGroup>
713

814
<actionGroup name="actionGroupWithDefaultArgumentAndStringSelectorParam">
915
<arguments>
10-
<argument name="someArgument" defaultValue="replacementPerson" />
16+
<argument name="someArgument" defaultValue="ReplacementPerson" />
1117
</arguments>
1218

13-
<see selector="{{SampleSection.oneParamElement('test1')}}" userInput="{{someArgument.firstname}}" mergeKey="seeFirstName" />
19+
<see selector="{{SampleSection.oneParamElement('test1')}}" userInput="{{someArgument.firstname}}" stepKey="seeFirstName" />
1420
</actionGroup>
1521

1622
<actionGroup name="actionGroupWithSingleParameterSelectorFromArgument">
1723
<arguments>
18-
<argument name="someArgument" defaultValue="replacementPerson" />
24+
<argument name="someArgument" defaultValue="ReplacementPerson" />
1925
</arguments>
2026

21-
<see selector="{{SampleSection.oneParamElement(someArgument.firstname)}}" userInput="{{someArgument.lastname}}" mergeKey="seeLastName" />
27+
<see selector="{{SampleSection.oneParamElement(someArgument.firstname)}}" userInput="{{someArgument.lastname}}" stepKey="seeLastName" />
2228
</actionGroup>
2329

2430
<actionGroup name="actionGroupWithMultipleParameterSelectorsFromArgument">
2531
<arguments>
26-
<argument name="someArgument" defaultValue="replacementPerson" />
32+
<argument name="someArgument" defaultValue="ReplacementPerson" />
2733
</arguments>
2834

29-
<see selector="{{SampleSection.threeParamElement(someArgument.firstname, someArgument.lastname, 'test')}}" userInput="{{someArgument.lastname}}" mergeKey="seeLastName" />
35+
<see selector="{{SampleSection.threeParamElement(someArgument.firstname, someArgument.lastname, 'test')}}" userInput="{{someArgument.lastname}}" stepKey="seeLastName" />
3036
</actionGroup>
3137
</config>

‎dev/tests/verification/TestModule/Cest/actionGroupCest.xml renamed to ‎dev/tests/verification/TestModule/Cest/ActionGroupCest.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<title value="Action Group With No Argument"/>
2323
</annotations>
2424

25-
<actionGroup ref="actionGroupWithoutArguments" mergeKey="actionGroup"/>
25+
<actionGroup ref="actionGroupWithoutArguments" stepKey="actionGroup"/>
2626
</test>
2727

2828
<test name="actionGroupWithDefaultArgumentAndStringSelectorParam">
@@ -31,7 +31,7 @@
3131
<title value="Action Group With Default Argument Value and Hardcoded Value in Param"/>
3232
</annotations>
3333

34-
<actionGroup ref="actionGroupWithDefaultArgumentAndStringSelectorParam" mergeKey="actionGroup"/>
34+
<actionGroup ref="actionGroupWithDefaultArgumentAndStringSelectorParam" stepKey="actionGroup"/>
3535
</test>
3636

3737
<test name="actionGroupWithPassedArgumentAndStringSelectorParam">
@@ -40,8 +40,8 @@
4040
<title value="Action Group With Passed Argument Value and Hardcoded Value in Param"/>
4141
</annotations>
4242

43-
<actionGroup ref="actionGroupWithDefaultArgumentAndStringSelectorParam" mergeKey="actionGroup">
44-
<argument name="someArgument" value="uniquePerson"/>
43+
<actionGroup ref="actionGroupWithDefaultArgumentAndStringSelectorParam" stepKey="actionGroup">
44+
<argument name="someArgument" value="UniquePerson"/>
4545
</actionGroup>
4646
</test>
4747

@@ -51,7 +51,7 @@
5151
<title value="Action Group With Default Argument Value and Argument Value in Param"/>
5252
</annotations>
5353

54-
<actionGroup ref="actionGroupWithSingleParameterSelectorFromArgument" mergeKey="actionGroup"/>
54+
<actionGroup ref="actionGroupWithSingleParameterSelectorFromArgument" stepKey="actionGroup"/>
5555
</test>
5656

5757
<test name="actionGroupWithSingleParameterSelectorFromPassedArgument">
@@ -60,8 +60,8 @@
6060
<title value="Action Group With Passed Argument Value and Argument Value in Param"/>
6161
</annotations>
6262

63-
<actionGroup ref="actionGroupWithSingleParameterSelectorFromArgument" mergeKey="actionGroup">
64-
<argument name="someArgument" value="uniquePerson"/>
63+
<actionGroup ref="actionGroupWithSingleParameterSelectorFromArgument" stepKey="actionGroup">
64+
<argument name="someArgument" value="UniquePerson"/>
6565
</actionGroup>
6666
</test>
6767

@@ -71,7 +71,7 @@
7171
<title value="Action Group With Passed Argument Value and Multiple Argument Values in Param"/>
7272
</annotations>
7373

74-
<actionGroup ref="actionGroupWithMultipleParameterSelectorsFromArgument" mergeKey="actionGroup"/>
74+
<actionGroup ref="actionGroupWithMultipleParameterSelectorsFromArgument" stepKey="actionGroup"/>
7575
</test>
7676
</cest>
7777
</config>

‎dev/tests/verification/TestModule/Data/ParameterArrayData.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-->
88

99
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
10+
xsi:noNamespaceSchemaLocation="../../../../../src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="simpleParamData" type="data">
1212
<data key="name">name</data>
1313
<data key="uniqueNamePre" unique="prefix">prename</data>

‎dev/tests/verification/Tests/ActionGroupGenerationTest.php

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ public function testBasicGeneration()
2525

2626
$this->assertFileEquals(
2727
self::RESOURCES_PATH . DIRECTORY_SEPARATOR . self::ACTION_GROUP_CEST . ".txt",
28-
$test->getExportDir() .
29-
DIRECTORY_SEPARATOR .
30-
self::ACTION_GROUP_CEST .
31-
".php"
28+
$test->getExportDir() . DIRECTORY_SEPARATOR . self::ACTION_GROUP_CEST . ".php"
3229
);
3330
}
3431
}

0 commit comments

Comments
 (0)