Skip to content

Commit 1b60a53

Browse files
KevinBKozanKevinBKozan
authored
Merge branch 'develop' into MQE-1672
2 parents 2f7ae70 + 5c7bea5 commit 1b60a53

File tree

10 files changed

+131
-19
lines changed

10 files changed

+131
-19
lines changed

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ class BasicFunctionalTestCest
9292
$I->dontSeeElementInDOM(".functionalTestSelector"); // stepKey: dontSeeElementInDOMKey1
9393
$I->dontSeeInCurrentUrl("/functionalUrl"); // stepKey: dontSeeInCurrentUrlKey1
9494
$I->dontSeeInField(".functionalTestSelector"); // stepKey: dontSeeInFieldKey1
95-
$I->dontSeeInPageSource("someInput"); // stepKey: dontSeeInPageSourceKey1
96-
$I->dontSeeInSource("<myHtmlHere>"); // stepKey: dontSeeInSourceKey1
95+
$I->dontSeeInPageSource("Cosmo Kramer"); // stepKey: dontSeeInPageSourceKey1
96+
$I->dontSeeInPageSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInPageSourceKey2
97+
$I->dontSeeInSource("Cosmo Kramer"); // stepKey: dontSeeInSourceKey1
98+
$I->dontSeeInSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInSourceKey2
9799
$I->dontSeeInTitle("someInput"); // stepKey: dontSeeInTitleKey1
98100
$I->dontSeeLink("someInput", "/functionalUrl"); // stepKey: dontSeeLinkKey1
99101
$I->dontSeeOptionIsSelected(".functionalTestSelector", "someInput"); // stepKey: dontSeeOptionIsSelectedKey1
@@ -146,9 +148,11 @@ class BasicFunctionalTestCest
146148
$I->seeElementInDOM(".functionalTestSelector"); // stepKey: seeElementInDOMKey1
147149
$I->seeInCurrentUrl("/functionalUrl"); // stepKey: seeInCurrentUrlKey1
148150
$I->seeInField(".functionalTestSelector", "someInput"); // stepKey: seeInFieldKey1
149-
$I->seeInPageSource("<myHtmlHere>"); // stepKey: seeInPageSourceKey1
151+
$I->seeInPageSource("Home Page"); // stepKey: seeInPageSourceKey1
152+
$I->seeInPageSource("<h1 class=\"page-title\">"); // stepKey: seeInPageSourceKey2
150153
$I->seeInPopup("someInput"); // stepKey: seeInPopupKey1
151-
$I->seeInSource("<myHtmlHere>"); // stepKey: seeInSourceKey1
154+
$I->seeInSource("Home Page"); // stepKey: seeInSourceKey1
155+
$I->seeInSource("<h1 class=\"page-title\">"); // stepKey: seeInSourceKey2
152156
$I->seeInTitle("someInput"); // stepKey: seeInTitleKey1
153157
$I->seeLink("someInput", "/functionalUrl"); // stepKey: seeLinkKey1
154158
$I->seeNumberOfElements(".functionalTestSelector"); // stepKey: seeNumberOfElementsKey1

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,41 @@ class DataReplacementTestCest
5353
$I->fillField(".selector", "0"); // stepKey: insertZero
5454
$insertCommand = $I->magentoCLI("do something Doe" . msq("uniqueData") . " with uniqueness"); // stepKey: insertCommand
5555
$I->comment($insertCommand);
56+
$I->seeInPageSource("StringBefore John StringAfter"); // stepKey: htmlReplace1
57+
$I->seeInPageSource("#John"); // stepKey: htmlReplace2
58+
$I->seeInPageSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace3
59+
$I->seeInPageSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace4
60+
$I->seeInPageSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace5
61+
$I->seeInPageSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace6
62+
$I->seeInPageSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace7
63+
$I->seeInPageSource("#element"); // stepKey: htmlReplace8
64+
$I->seeInPageSource("StringBefore #element StringAfter"); // stepKey: htmlReplace9
65+
$I->dontSeeInPageSource("StringBefore John StringAfter"); // stepKey: htmlReplace10
66+
$I->dontSeeInPageSource("#John"); // stepKey: htmlReplace11
67+
$I->dontSeeInPageSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace12
68+
$I->dontSeeInPageSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace13
69+
$I->dontSeeInPageSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace14
70+
$I->dontSeeInPageSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace15
71+
$I->dontSeeInPageSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace16
72+
$I->dontSeeInPageSource("#element"); // stepKey: htmlReplace17
73+
$I->dontSeeInPageSource("StringBefore #element StringAfter"); // stepKey: htmlReplace18
74+
$I->seeInSource("StringBefore John StringAfter"); // stepKey: htmlReplace19
75+
$I->seeInSource("#John"); // stepKey: htmlReplace20
76+
$I->seeInSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace21
77+
$I->seeInSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace22
78+
$I->seeInSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace23
79+
$I->seeInSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace24
80+
$I->seeInSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace25
81+
$I->seeInSource("#element"); // stepKey: htmlReplace26
82+
$I->seeInSource("StringBefore #element StringAfter"); // stepKey: htmlReplace27
83+
$I->dontSeeInSource("StringBefore John StringAfter"); // stepKey: htmlReplace28
84+
$I->dontSeeInSource("#John"); // stepKey: htmlReplace29
85+
$I->dontSeeInSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace30
86+
$I->dontSeeInSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace31
87+
$I->dontSeeInSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace32
88+
$I->dontSeeInSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace33
89+
$I->dontSeeInSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace34
90+
$I->dontSeeInSource("#element"); // stepKey: htmlReplace35
91+
$I->dontSeeInSource("StringBefore #element StringAfter"); // stepKey: htmlReplace36
5692
}
5793
}

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,5 +63,17 @@ class PersistedReplacementTestCest
6363
$I->searchAndMultiSelectOption("#selector", [PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test'), PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'lastname', 'test')]); // stepKey: parameterArrayReplacement
6464
$I->fillField("#selector", "John " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " stringLiteral"); // stepKey: allTypesMixed
6565
$I->searchAndMultiSelectOption("#selector", [PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test'), "John", "stringLiteral"]); // stepKey: parameterArrayMixed
66+
$I->seeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace1
67+
$I->seeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace2
68+
$I->seeInPageSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace3
69+
$I->dontSeeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace4
70+
$I->dontSeeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace5
71+
$I->dontSeeInPageSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace6
72+
$I->seeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace7
73+
$I->seeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace8
74+
$I->seeInSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace9
75+
$I->dontSeeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace10
76+
$I->dontSeeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace11
77+
$I->dontSeeInSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace12
6678
}
6779
}

‎dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,10 @@
5050
<dontSeeElementInDOM selector=".functionalTestSelector" stepKey="dontSeeElementInDOMKey1"/>
5151
<dontSeeInCurrentUrl url="/functionalUrl" stepKey="dontSeeInCurrentUrlKey1"/>
5252
<dontSeeInField selector=".functionalTestSelector" stepKey="dontSeeInFieldKey1" />
53-
<dontSeeInPageSource userInput="someInput" stepKey="dontSeeInPageSourceKey1"/>
54-
<dontSeeInSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="dontSeeInSourceKey1"/>
53+
<dontSeeInPageSource html="Cosmo Kramer" stepKey="dontSeeInPageSourceKey1"/>
54+
<dontSeeInPageSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey2"/>
55+
<dontSeeInSource html="Cosmo Kramer" stepKey="dontSeeInSourceKey1"/>
56+
<dontSeeInSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInSourceKey2"/>
5557
<dontSeeInTitle userInput="someInput" stepKey="dontSeeInTitleKey1"/>
5658
<dontSeeLink userInput="someInput" url="/functionalUrl" stepKey="dontSeeLinkKey1" />
5759
<dontSeeOptionIsSelected selector=".functionalTestSelector" userInput="someInput" stepKey="dontSeeOptionIsSelectedKey1" />
@@ -95,9 +97,11 @@
9597
<seeElementInDOM selector=".functionalTestSelector" stepKey="seeElementInDOMKey1"/>
9698
<seeInCurrentUrl url="/functionalUrl" stepKey="seeInCurrentUrlKey1"/>
9799
<seeInField selector=".functionalTestSelector" userInput="someInput" stepKey="seeInFieldKey1" />
98-
<seeInPageSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="seeInPageSourceKey1"/>
100+
<seeInPageSource html="Home Page" stepKey="seeInPageSourceKey1"/>
101+
<seeInPageSource html="&#60;h1 class&#61;&#34;page-title&#34;&#62;" stepKey="seeInPageSourceKey2"/>
99102
<seeInPopup userInput="someInput" stepKey="seeInPopupKey1"/>
100-
<seeInSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="seeInSourceKey1"/>
103+
<seeInSource html="Home Page" stepKey="seeInSourceKey1"/>
104+
<seeInSource html="&#60;h1 class&#61;&#34;page-title&#34;&#62;" stepKey="seeInSourceKey2"/>
101105
<seeInTitle userInput="someInput" stepKey="seeInTitleKey1"/>
102106
<seeLink userInput="someInput" url="/functionalUrl" stepKey="seeLinkKey1" />
103107
<seeNumberOfElements selector=".functionalTestSelector" stepKey="seeNumberOfElementsKey1"/>

‎dev/tests/verification/TestModule/Test/DataReplacementTest.xml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,45 @@
3939

4040
<fillField stepKey="insertZero" selector=".selector" userInput="{{simpleData.favoriteIndex}}"/>
4141
<magentoCLI stepKey="insertCommand" command="do something {{uniqueData.lastname}} with uniqueness"/>
42+
43+
<seeInPageSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace1"/>
44+
<seeInPageSource html="#{{simpleData.firstname}}" stepKey="htmlReplace2"/>
45+
<seeInPageSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace3"/>
46+
<seeInPageSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace4"/>
47+
<seeInPageSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace5"/>
48+
<seeInPageSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace6"/>
49+
<seeInPageSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace7"/>
50+
<seeInPageSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace8"/>
51+
<seeInPageSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace9"/>
52+
53+
<dontSeeInPageSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace10"/>
54+
<dontSeeInPageSource html="#{{simpleData.firstname}}" stepKey="htmlReplace11"/>
55+
<dontSeeInPageSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace12"/>
56+
<dontSeeInPageSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace13"/>
57+
<dontSeeInPageSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace14"/>
58+
<dontSeeInPageSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace15"/>
59+
<dontSeeInPageSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace16"/>
60+
<dontSeeInPageSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace17"/>
61+
<dontSeeInPageSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace18"/>
62+
63+
<seeInSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace19"/>
64+
<seeInSource html="#{{simpleData.firstname}}" stepKey="htmlReplace20"/>
65+
<seeInSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace21"/>
66+
<seeInSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace22"/>
67+
<seeInSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace23"/>
68+
<seeInSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace24"/>
69+
<seeInSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace25"/>
70+
<seeInSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace26"/>
71+
<seeInSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace27"/>
72+
73+
<dontSeeInSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace28"/>
74+
<dontSeeInSource html="#{{simpleData.firstname}}" stepKey="htmlReplace29"/>
75+
<dontSeeInSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace30"/>
76+
<dontSeeInSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace31"/>
77+
<dontSeeInSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace32"/>
78+
<dontSeeInSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace33"/>
79+
<dontSeeInSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace34"/>
80+
<dontSeeInSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace35"/>
81+
<dontSeeInSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace36"/>
4282
</test>
4383
</tests>

‎dev/tests/verification/TestModule/Test/PersistedReplacementTest.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,21 @@
2424
<searchAndMultiSelectOption stepKey="parameterArrayReplacement" selector="#selector" parameterArray="[$createdData.firstname$, $createdData.lastname$]"/>
2525
<fillField stepKey="allTypesMixed" selector="#selector" userInput="{{simpleData.firstname}} $createdData.firstname$ stringLiteral"/>
2626
<searchAndMultiSelectOption stepKey="parameterArrayMixed" selector="#selector" parameterArray="[$createdData.firstname$, {{simpleData.firstname}}, stringLiteral]"/>
27+
28+
<seeInPageSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace1"/>
29+
<seeInPageSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace2"/>
30+
<seeInPageSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace3"/>
31+
32+
<dontSeeInPageSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace4"/>
33+
<dontSeeInPageSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace5"/>
34+
<dontSeeInPageSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace6"/>
35+
36+
<seeInSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace7"/>
37+
<seeInSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace8"/>
38+
<seeInSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace9"/>
39+
40+
<dontSeeInSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace10"/>
41+
<dontSeeInSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace11"/>
42+
<dontSeeInSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace12"/>
2743
</test>
2844
</tests>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,8 @@
6666
<dontSeeInField stepKey="dntsinfld2"/>
6767
<dontSeeInFormFields selector="1" stepKey="dntsinffld1"/>
6868
<dontSeeInFormFields selector="1" stepKey="dntsinffld2"/>
69-
<dontSeeInPageSource stepKey="dntsinpgs1"/>
70-
<dontSeeInPageSource stepKey="dntsinpgs2"/>
69+
<dontSeeInPageSource html="1" stepKey="dntsinpgs1"/>
70+
<dontSeeInPageSource html="1" stepKey="dntsinpgs2"/>
7171
<dontSeeInSource html="1" stepKey="dntsinsource1"/>
7272
<dontSeeInSource html="1" stepKey="dntsinsource2"/>
7373
<dontSeeInTitle stepKey="dntsintitle1"/>
@@ -282,8 +282,8 @@
282282
<dontSeeInField stepKey="dntsinfld2"/>
283283
<dontSeeInFormFields selector="1" stepKey="dntsinffld1"/>
284284
<dontSeeInFormFields selector="1" stepKey="dntsinffld2"/>
285-
<dontSeeInPageSource stepKey="dntsinpgs1"/>
286-
<dontSeeInPageSource stepKey="dntsinpgs2"/>
285+
<dontSeeInPageSource html="1" stepKey="dntsinpgs1"/>
286+
<dontSeeInPageSource html="1" stepKey="dntsinpgs2"/>
287287
<dontSeeInSource html="1" stepKey="dntsinsource1"/>
288288
<dontSeeInSource html="1" stepKey="dntsinsource2"/>
289289
<dontSeeInTitle stepKey="dntsintitle1"/>
@@ -497,8 +497,8 @@
497497
<dontSeeInField stepKey="dntsinfld2"/>
498498
<dontSeeInFormFields selector="1" stepKey="dntsinffld1"/>
499499
<dontSeeInFormFields selector="1" stepKey="dntsinffld2"/>
500-
<dontSeeInPageSource stepKey="dntsinpgs1"/>
501-
<dontSeeInPageSource stepKey="dntsinpgs2"/>
500+
<dontSeeInPageSource html="1" stepKey="dntsinpgs1"/>
501+
<dontSeeInPageSource html="1" stepKey="dntsinpgs2"/>
502502
<dontSeeInSource html="1" stepKey="dntsinsource1"/>
503503
<dontSeeInSource html="1" stepKey="dntsinsource2"/>
504504
<dontSeeInTitle stepKey="dntsintitle1"/>

‎src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@ class ActionObject
5353
"function",
5454
'filterSelector',
5555
'optionSelector',
56-
"command"
56+
"command",
57+
"html"
5758
];
5859
const OLD_ASSERTION_ATTRIBUTES = ["expected", "expectedType", "actual", "actualType"];
5960
const ASSERTION_ATTRIBUTES = ["expectedResult" => "expected", "actualResult" => "actual"];

‎src/Magento/FunctionalTestingFramework/Test/etc/Actions/dontSeeActions.xsd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@
172172
</xs:annotation>
173173
<xs:simpleContent>
174174
<xs:extension base="xs:string">
175-
<xs:attribute ref="userInput"/>
175+
<xs:attribute ref="html" use="required"/>
176176
<xs:attributeGroup ref="commonActionAttributes"/>
177177
</xs:extension>
178178
</xs:simpleContent>

‎src/Magento/FunctionalTestingFramework/Util/TestGenerator.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
664664
}
665665

666666
if (isset($customActionAttributes['html'])) {
667-
$html = $customActionAttributes['html'];
667+
$html = $this->addUniquenessFunctionCall($customActionAttributes['html']);
668668
}
669669

670670
if (isset($customActionAttributes['locale'])) {
@@ -1154,7 +1154,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
11541154
case "dontSeeInField":
11551155
case "dontSeeInCurrentUrl":
11561156
case "dontSeeInTitle":
1157-
case "dontSeeInPageSource":
11581157
case "dontSeeOptionIsSelected":
11591158
case "fillField":
11601159
case "loadSessionSnapshot":
@@ -1172,9 +1171,9 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
11721171
);
11731172
break;
11741173
case "seeInPageSource":
1174+
case "dontSeeInPageSource":
11751175
case "seeInSource":
11761176
case "dontSeeInSource":
1177-
// TODO: Need to fix xml parser to allow parsing html.
11781177
$testSteps .= $this->wrapFunctionCall($actor, $actionObject, $html);
11791178
break;
11801179
case "conditionalClick":

0 commit comments

Comments
 (0)