Skip to content

MQE-1636: [GENERATOR] Page Source Actions are not quoted properly #394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 26, 2019
Merged

MQE-1636: [GENERATOR] Page Source Actions are not quoted properly #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee03951
MQE-1636: [GENERATOR] Page Source Actions are not quoted properly
tomreece Jul 25, 2019
f473287
Merge branch 'develop' into MQE-1636
KevinBKozan Jul 26, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions dev/tests/verification/Resources/BasicFunctionalTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ class BasicFunctionalTestCest
$I->dontSeeElementInDOM(".functionalTestSelector"); // stepKey: dontSeeElementInDOMKey1
$I->dontSeeInCurrentUrl("/functionalUrl"); // stepKey: dontSeeInCurrentUrlKey1
$I->dontSeeInField(".functionalTestSelector"); // stepKey: dontSeeInFieldKey1
$I->dontSeeInPageSource("someInput"); // stepKey: dontSeeInPageSourceKey1
$I->dontSeeInSource("<myHtmlHere>"); // stepKey: dontSeeInSourceKey1
$I->dontSeeInPageSource("Cosmo Kramer"); // stepKey: dontSeeInPageSourceKey1
$I->dontSeeInPageSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInPageSourceKey2
$I->dontSeeInSource("Cosmo Kramer"); // stepKey: dontSeeInSourceKey1
$I->dontSeeInSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInSourceKey2
$I->dontSeeInTitle("someInput"); // stepKey: dontSeeInTitleKey1
$I->dontSeeLink("someInput", "/functionalUrl"); // stepKey: dontSeeLinkKey1
$I->dontSeeOptionIsSelected(".functionalTestSelector", "someInput"); // stepKey: dontSeeOptionIsSelectedKey1
Expand Down Expand Up @@ -146,9 +148,11 @@ class BasicFunctionalTestCest
$I->seeElementInDOM(".functionalTestSelector"); // stepKey: seeElementInDOMKey1
$I->seeInCurrentUrl("/functionalUrl"); // stepKey: seeInCurrentUrlKey1
$I->seeInField(".functionalTestSelector", "someInput"); // stepKey: seeInFieldKey1
$I->seeInPageSource("<myHtmlHere>"); // stepKey: seeInPageSourceKey1
$I->seeInPageSource("Home Page"); // stepKey: seeInPageSourceKey1
$I->seeInPageSource("<h1 class=\"page-title\">"); // stepKey: seeInPageSourceKey2
$I->seeInPopup("someInput"); // stepKey: seeInPopupKey1
$I->seeInSource("<myHtmlHere>"); // stepKey: seeInSourceKey1
$I->seeInSource("Home Page"); // stepKey: seeInSourceKey1
$I->seeInSource("<h1 class=\"page-title\">"); // stepKey: seeInSourceKey2
$I->seeInTitle("someInput"); // stepKey: seeInTitleKey1
$I->seeLink("someInput", "/functionalUrl"); // stepKey: seeLinkKey1
$I->seeNumberOfElements(".functionalTestSelector"); // stepKey: seeNumberOfElementsKey1
Expand Down
36 changes: 36 additions & 0 deletions dev/tests/verification/Resources/DataReplacementTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,41 @@ class DataReplacementTestCest
$I->fillField(".selector", "0"); // stepKey: insertZero
$insertCommand = $I->magentoCLI("do something Doe" . msq("uniqueData") . " with uniqueness"); // stepKey: insertCommand
$I->comment($insertCommand);
$I->seeInPageSource("StringBefore John StringAfter"); // stepKey: htmlReplace1
$I->seeInPageSource("#John"); // stepKey: htmlReplace2
$I->seeInPageSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace3
$I->seeInPageSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace4
$I->seeInPageSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace5
$I->seeInPageSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace6
$I->seeInPageSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace7
$I->seeInPageSource("#element"); // stepKey: htmlReplace8
$I->seeInPageSource("StringBefore #element StringAfter"); // stepKey: htmlReplace9
$I->dontSeeInPageSource("StringBefore John StringAfter"); // stepKey: htmlReplace10
$I->dontSeeInPageSource("#John"); // stepKey: htmlReplace11
$I->dontSeeInPageSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace12
$I->dontSeeInPageSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace13
$I->dontSeeInPageSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace14
$I->dontSeeInPageSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace15
$I->dontSeeInPageSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace16
$I->dontSeeInPageSource("#element"); // stepKey: htmlReplace17
$I->dontSeeInPageSource("StringBefore #element StringAfter"); // stepKey: htmlReplace18
$I->seeInSource("StringBefore John StringAfter"); // stepKey: htmlReplace19
$I->seeInSource("#John"); // stepKey: htmlReplace20
$I->seeInSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace21
$I->seeInSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace22
$I->seeInSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace23
$I->seeInSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace24
$I->seeInSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace25
$I->seeInSource("#element"); // stepKey: htmlReplace26
$I->seeInSource("StringBefore #element StringAfter"); // stepKey: htmlReplace27
$I->dontSeeInSource("StringBefore John StringAfter"); // stepKey: htmlReplace28
$I->dontSeeInSource("#John"); // stepKey: htmlReplace29
$I->dontSeeInSource("StringBefore " . msq("uniqueData") . "John StringAfter"); // stepKey: htmlReplace30
$I->dontSeeInSource("#" . msq("uniqueData") . "John"); // stepKey: htmlReplace31
$I->dontSeeInSource("#" . msq("uniqueData") . "John#" . msq("uniqueData") . "John"); // stepKey: htmlReplace32
$I->dontSeeInSource("StringBefore Doe" . msq("uniqueData") . " StringAfter"); // stepKey: htmlReplace33
$I->dontSeeInSource("#Doe" . msq("uniqueData")); // stepKey: htmlReplace34
$I->dontSeeInSource("#element"); // stepKey: htmlReplace35
$I->dontSeeInSource("StringBefore #element StringAfter"); // stepKey: htmlReplace36
}
}
12 changes: 12 additions & 0 deletions dev/tests/verification/Resources/PersistedReplacementTest.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,5 +63,17 @@ class PersistedReplacementTestCest
$I->searchAndMultiSelectOption("#selector", [PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test'), PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'lastname', 'test')]); // stepKey: parameterArrayReplacement
$I->fillField("#selector", "John " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " stringLiteral"); // stepKey: allTypesMixed
$I->searchAndMultiSelectOption("#selector", [PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test'), "John", "stringLiteral"]); // stepKey: parameterArrayMixed
$I->seeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace1
$I->seeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace2
$I->seeInPageSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace3
$I->dontSeeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace4
$I->dontSeeInPageSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace5
$I->dontSeeInPageSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace6
$I->seeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace7
$I->seeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace8
$I->seeInSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace9
$I->dontSeeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace10
$I->dontSeeInSource("StringBefore " . PersistedObjectHandler::getInstance()->retrieveEntityField('createData1', 'firstname', 'test') . " StringAfter"); // stepKey: htmlReplace11
$I->dontSeeInSource("#" . getenv("MAGENTO_BASE_URL") . "#" . PersistedObjectHandler::getInstance()->retrieveEntityField('createdData', 'firstname', 'test')); // stepKey: htmlReplace12
}
}
12 changes: 8 additions & 4 deletions dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,10 @@
<dontSeeElementInDOM selector=".functionalTestSelector" stepKey="dontSeeElementInDOMKey1"/>
<dontSeeInCurrentUrl url="/functionalUrl" stepKey="dontSeeInCurrentUrlKey1"/>
<dontSeeInField selector=".functionalTestSelector" stepKey="dontSeeInFieldKey1" />
<dontSeeInPageSource userInput="someInput" stepKey="dontSeeInPageSourceKey1"/>
<dontSeeInSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="dontSeeInSourceKey1"/>
<dontSeeInPageSource html="Cosmo Kramer" stepKey="dontSeeInPageSourceKey1"/>
<dontSeeInPageSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey2"/>
<dontSeeInSource html="Cosmo Kramer" stepKey="dontSeeInSourceKey1"/>
<dontSeeInSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInSourceKey2"/>
<dontSeeInTitle userInput="someInput" stepKey="dontSeeInTitleKey1"/>
<dontSeeLink userInput="someInput" url="/functionalUrl" stepKey="dontSeeLinkKey1" />
<dontSeeOptionIsSelected selector=".functionalTestSelector" userInput="someInput" stepKey="dontSeeOptionIsSelectedKey1" />
Expand Down Expand Up @@ -95,9 +97,11 @@
<seeElementInDOM selector=".functionalTestSelector" stepKey="seeElementInDOMKey1"/>
<seeInCurrentUrl url="/functionalUrl" stepKey="seeInCurrentUrlKey1"/>
<seeInField selector=".functionalTestSelector" userInput="someInput" stepKey="seeInFieldKey1" />
<seeInPageSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="seeInPageSourceKey1"/>
<seeInPageSource html="Home Page" stepKey="seeInPageSourceKey1"/>
<seeInPageSource html="&#60;h1 class&#61;&#34;page-title&#34;&#62;" stepKey="seeInPageSourceKey2"/>
<seeInPopup userInput="someInput" stepKey="seeInPopupKey1"/>
<seeInSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="seeInSourceKey1"/>
<seeInSource html="Home Page" stepKey="seeInSourceKey1"/>
<seeInSource html="&#60;h1 class&#61;&#34;page-title&#34;&#62;" stepKey="seeInSourceKey2"/>
<seeInTitle userInput="someInput" stepKey="seeInTitleKey1"/>
<seeLink userInput="someInput" url="/functionalUrl" stepKey="seeLinkKey1" />
<seeNumberOfElements selector=".functionalTestSelector" stepKey="seeNumberOfElementsKey1"/>
Expand Down
40 changes: 40 additions & 0 deletions dev/tests/verification/TestModule/Test/DataReplacementTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,45 @@

<fillField stepKey="insertZero" selector=".selector" userInput="{{simpleData.favoriteIndex}}"/>
<magentoCLI stepKey="insertCommand" command="do something {{uniqueData.lastname}} with uniqueness"/>

<seeInPageSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace1"/>
<seeInPageSource html="#{{simpleData.firstname}}" stepKey="htmlReplace2"/>
<seeInPageSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace3"/>
<seeInPageSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace4"/>
<seeInPageSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace5"/>
<seeInPageSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace6"/>
<seeInPageSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace7"/>
<seeInPageSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace8"/>
<seeInPageSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace9"/>

<dontSeeInPageSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace10"/>
<dontSeeInPageSource html="#{{simpleData.firstname}}" stepKey="htmlReplace11"/>
<dontSeeInPageSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace12"/>
<dontSeeInPageSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace13"/>
<dontSeeInPageSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace14"/>
<dontSeeInPageSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace15"/>
<dontSeeInPageSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace16"/>
<dontSeeInPageSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace17"/>
<dontSeeInPageSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace18"/>

<seeInSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace19"/>
<seeInSource html="#{{simpleData.firstname}}" stepKey="htmlReplace20"/>
<seeInSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace21"/>
<seeInSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace22"/>
<seeInSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace23"/>
<seeInSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace24"/>
<seeInSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace25"/>
<seeInSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace26"/>
<seeInSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace27"/>

<dontSeeInSource html="StringBefore {{simpleData.firstname}} StringAfter" stepKey="htmlReplace28"/>
<dontSeeInSource html="#{{simpleData.firstname}}" stepKey="htmlReplace29"/>
<dontSeeInSource html="StringBefore {{uniqueData.firstname}} StringAfter" stepKey="htmlReplace30"/>
<dontSeeInSource html="#{{uniqueData.firstname}}" stepKey="htmlReplace31"/>
<dontSeeInSource html="#{{uniqueData.firstname}}#{{uniqueData.firstname}}" stepKey="htmlReplace32"/>
<dontSeeInSource html="StringBefore {{uniqueData.lastname}} StringAfter" stepKey="htmlReplace33"/>
<dontSeeInSource html="#{{uniqueData.lastname}}" stepKey="htmlReplace34"/>
<dontSeeInSource html="{{SampleSection.simpleElement}}" stepKey="htmlReplace35"/>
<dontSeeInSource html="StringBefore {{SampleSection.simpleElement}} StringAfter" stepKey="htmlReplace36"/>
</test>
</tests>
16 changes: 16 additions & 0 deletions dev/tests/verification/TestModule/Test/PersistedReplacementTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,21 @@
<searchAndMultiSelectOption stepKey="parameterArrayReplacement" selector="#selector" parameterArray="[$createdData.firstname$, $createdData.lastname$]"/>
<fillField stepKey="allTypesMixed" selector="#selector" userInput="{{simpleData.firstname}} $createdData.firstname$ stringLiteral"/>
<searchAndMultiSelectOption stepKey="parameterArrayMixed" selector="#selector" parameterArray="[$createdData.firstname$, {{simpleData.firstname}}, stringLiteral]"/>

<seeInPageSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace1"/>
<seeInPageSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace2"/>
<seeInPageSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace3"/>

<dontSeeInPageSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace4"/>
<dontSeeInPageSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace5"/>
<dontSeeInPageSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace6"/>

<seeInSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace7"/>
<seeInSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace8"/>
<seeInSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace9"/>

<dontSeeInSource html="StringBefore $createdData.firstname$ StringAfter" stepKey="htmlReplace10"/>
<dontSeeInSource html="StringBefore $$createData1.firstname$$ StringAfter" stepKey="htmlReplace11"/>
<dontSeeInSource html="#{{_ENV.MAGENTO_BASE_URL}}#$createdData.firstname$" stepKey="htmlReplace12"/>
</test>
</tests>
12 changes: 6 additions & 6 deletions dev/tests/verification/TestModule/Test/XmlDuplicateTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@
<dontSeeInField stepKey="dntsinfld2"/>
<dontSeeInFormFields selector="1" stepKey="dntsinffld1"/>
<dontSeeInFormFields selector="1" stepKey="dntsinffld2"/>
<dontSeeInPageSource stepKey="dntsinpgs1"/>
<dontSeeInPageSource stepKey="dntsinpgs2"/>
<dontSeeInPageSource html="1" stepKey="dntsinpgs1"/>
<dontSeeInPageSource html="1" stepKey="dntsinpgs2"/>
<dontSeeInSource html="1" stepKey="dntsinsource1"/>
<dontSeeInSource html="1" stepKey="dntsinsource2"/>
<dontSeeInTitle stepKey="dntsintitle1"/>
Expand Down Expand Up @@ -282,8 +282,8 @@
<dontSeeInField stepKey="dntsinfld2"/>
<dontSeeInFormFields selector="1" stepKey="dntsinffld1"/>
<dontSeeInFormFields selector="1" stepKey="dntsinffld2"/>
<dontSeeInPageSource stepKey="dntsinpgs1"/>
<dontSeeInPageSource stepKey="dntsinpgs2"/>
<dontSeeInPageSource html="1" stepKey="dntsinpgs1"/>
<dontSeeInPageSource html="1" stepKey="dntsinpgs2"/>
<dontSeeInSource html="1" stepKey="dntsinsource1"/>
<dontSeeInSource html="1" stepKey="dntsinsource2"/>
<dontSeeInTitle stepKey="dntsintitle1"/>
Expand Down Expand Up @@ -497,8 +497,8 @@
<dontSeeInField stepKey="dntsinfld2"/>
<dontSeeInFormFields selector="1" stepKey="dntsinffld1"/>
<dontSeeInFormFields selector="1" stepKey="dntsinffld2"/>
<dontSeeInPageSource stepKey="dntsinpgs1"/>
<dontSeeInPageSource stepKey="dntsinpgs2"/>
<dontSeeInPageSource html="1" stepKey="dntsinpgs1"/>
<dontSeeInPageSource html="1" stepKey="dntsinpgs2"/>
<dontSeeInSource html="1" stepKey="dntsinsource1"/>
<dontSeeInSource html="1" stepKey="dntsinsource2"/>
<dontSeeInTitle stepKey="dntsintitle1"/>
Expand Down
3 changes: 2 additions & 1 deletion src/Magento/FunctionalTestingFramework/Test/Objects/ActionObject.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ class ActionObject
"function",
'filterSelector',
'optionSelector',
"command"
"command",
"html"
];
const OLD_ASSERTION_ATTRIBUTES = ["expected", "expectedType", "actual", "actualType"];
const ASSERTION_ATTRIBUTES = ["expectedResult" => "expected", "actualResult" => "actual"];
Expand Down
2 changes: 1 addition & 1 deletion src/Magento/FunctionalTestingFramework/Test/etc/Actions/dontSeeActions.xsd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@
</xs:annotation>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute ref="userInput"/>
<xs:attribute ref="html" use="required"/>
<xs:attributeGroup ref="commonActionAttributes"/>
</xs:extension>
</xs:simpleContent>
Expand Down
5 changes: 2 additions & 3 deletions src/Magento/FunctionalTestingFramework/Util/TestGenerator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
}

if (isset($customActionAttributes['html'])) {
$html = $customActionAttributes['html'];
$html = $this->addUniquenessFunctionCall($customActionAttributes['html']);
}

if (isset($customActionAttributes['locale'])) {
Expand Down Expand Up @@ -1154,7 +1154,6 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
case "dontSeeInField":
case "dontSeeInCurrentUrl":
case "dontSeeInTitle":
case "dontSeeInPageSource":
case "dontSeeOptionIsSelected":
case "fillField":
case "loadSessionSnapshot":
Expand All @@ -1172,9 +1171,9 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
);
break;
case "seeInPageSource":
case "dontSeeInPageSource":
case "seeInSource":
case "dontSeeInSource":
// TODO: Need to fix xml parser to allow parsing html.
$testSteps .= $this->wrapFunctionCall($actor, $actionObject, $html);
break;
case "conditionalClick":
Expand Down