Skip to content

Commit d3a54e6

Browse files
committed
MQE-741: two steps with same step key, the later step will overwrite the previous step.
- verification test fixes
1 parent 345fe29 commit d3a54e6

File tree

5 files changed

+83
-60
lines changed

5 files changed

+83
-60
lines changed

dev/tests/verification/TestModule/Test/XmlDuplicateTest.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
<amOnSubdomain stepKey="aosd2" url="1"/>
1919
<amOnUrl stepKey="aou1" url="1"/>
2020
<amOnUrl stepKey="aou2" url="1"/>
21-
<appendField selector="1" stepKey="ap1"/>
22-
<appendField selector="1" stepKey="ap2"/>
21+
<appendField selector="1" stepKey="app1"/>
22+
<appendField selector="1" stepKey="app2"/>
2323
<attachFile selector="1" stepKey="atf1"/>
2424
<attachFile selector="1" stepKey="atf2"/>
2525
<cancelPopup stepKey="cp1"/>
@@ -166,8 +166,8 @@
166166
<seeInField stepKey="seeinfield12"/>
167167
<seeInFormFields selector="2" parameterArray="[2]" stepKey="seeinformfields1"/>
168168
<seeInFormFields selector="2" parameterArray="[2]" stepKey="seeinformfields12"/>
169-
<seeInPageSource html="1" stepKey="seeinsource1"/>
170-
<seeInPageSource html="1" stepKey="seeinsource12"/>
169+
<seeInPageSource html="1" stepKey="seeinpagesource1"/>
170+
<seeInPageSource html="1" stepKey="seeinpagesource12"/>
171171
<seeInPopup stepKey="seeinpopup1"/>
172172
<seeInPopup stepKey="seeinpopup12"/>
173173
<seeInSource html="1" stepKey="seeinsource1"/>
@@ -232,8 +232,8 @@
232232
<amOnSubdomain stepKey="aosd2" url="1"/>
233233
<amOnUrl stepKey="aou1" url="1"/>
234234
<amOnUrl stepKey="aou2" url="1"/>
235-
<appendField selector="1" stepKey="ap1"/>
236-
<appendField selector="1" stepKey="ap2"/>
235+
<appendField selector="1" stepKey="app1"/>
236+
<appendField selector="1" stepKey="app2"/>
237237
<attachFile selector="1" stepKey="atf1"/>
238238
<attachFile selector="1" stepKey="atf2"/>
239239
<cancelPopup stepKey="cp1"/>
@@ -380,8 +380,8 @@
380380
<seeInField stepKey="seeinfield12"/>
381381
<seeInFormFields selector="2" parameterArray="[1]" stepKey="seeinformfields1"/>
382382
<seeInFormFields selector="2" parameterArray="[1]" stepKey="seeinformfields12"/>
383-
<seeInPageSource html="1" stepKey="seeinsource1"/>
384-
<seeInPageSource html="1" stepKey="seeinsource12"/>
383+
<seeInPageSource html="1" stepKey="seeinpagesource1"/>
384+
<seeInPageSource html="1" stepKey="seeinpagesource12"/>
385385
<seeInPopup stepKey="seeinpopup1"/>
386386
<seeInPopup stepKey="seeinpopup12"/>
387387
<seeInSource html="1" stepKey="seeinsource1"/>
@@ -445,8 +445,8 @@
445445
<amOnSubdomain stepKey="aosd2" url="1"/>
446446
<amOnUrl stepKey="aou1" url="1"/>
447447
<amOnUrl stepKey="aou2" url="1"/>
448-
<appendField selector="1" stepKey="ap1"/>
449-
<appendField selector="1" stepKey="ap2"/>
448+
<appendField selector="1" stepKey="app1"/>
449+
<appendField selector="1" stepKey="app2"/>
450450
<attachFile selector="1" stepKey="atf1"/>
451451
<attachFile selector="1" stepKey="atf2"/>
452452
<cancelPopup stepKey="cp1"/>
@@ -593,8 +593,8 @@
593593
<seeInField stepKey="seeinfield12"/>
594594
<seeInFormFields selector="2" parameterArray="[1]" stepKey="seeinformfields1"/>
595595
<seeInFormFields selector="2" parameterArray="[1]" stepKey="seeinformfields12"/>
596-
<seeInPageSource html="1" stepKey="seeinsource1"/>
597-
<seeInPageSource html="1" stepKey="seeinsource12"/>
596+
<seeInPageSource html="1" stepKey="seeinpagesource1"/>
597+
<seeInPageSource html="1" stepKey="seeinpagesource12"/>
598598
<seeInPopup stepKey="seeinpopup1"/>
599599
<seeInPopup stepKey="seeinpopup12"/>
600600
<seeInSource html="1" stepKey="seeinsource1"/>

src/Magento/FunctionalTestingFramework/Config/SchemaLocator.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ class SchemaLocator implements \Magento\FunctionalTestingFramework\Config\Schema
2525
*/
2626
private $perFileSchema;
2727

28-
2928
/**
3029
* Class constructor
3130
*

src/Magento/FunctionalTestingFramework/Test/Objects/TestObject.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,8 @@ class TestObject
5050
* @param ActionObject[] $parsedSteps
5151
* @param array $annotations
5252
* @param TestHookObject[] $hooks
53-
* @param string $xmlFileSource
5453
*/
55-
public function __construct($name, $parsedSteps, $annotations, $hooks, $xmlFileSource = null)
54+
public function __construct($name, $parsedSteps, $annotations, $hooks)
5655
{
5756
$this->name = $name;
5857
$this->parsedSteps = $parsedSteps;

0 commit comments

Comments
 (0)