Skip to content

Commit 724af1d

Browse files
committed
Merge branch 'MQE-574' into sprint-develop
# Conflicts: # src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd
2 parents 7c4954b + d1dc19e commit 724af1d

File tree

4 files changed

+272
-195
lines changed

4 files changed

+272
-195
lines changed

dev/tests/verification/Resources/BasicFunctionalCest.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class BasicFunctionalCest
5757
$I->clickWithLeftButton(".functionalTestSelector");
5858
$I->clickWithRightButton(".functionalTestSelector");
5959
$I->closeTab();
60-
$I->conditionalClick(".functionalTestSelector", ".functionalDependentTestSelector");
60+
$I->conditionalClick(".functionalTestSelector", ".functionalDependentTestSelector", true);
6161
$I->dontSee("someInput", ".functionalTestSelector");
6262
$I->dontSeeCheckboxIsChecked(".functionalTestSelector");
6363
$I->dontSeeCookie("someInput");

dev/tests/verification/TestModule/Cest/BasicFunctionalCest.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@
3333
<grabValueFrom returnVariable="someVar" stepKey="someVarDefinition"/>
3434
<acceptPopup stepKey="acceptPopupKey1"/>
3535
<amOnPage stepKey="amOnPageKey1" url="/test/url"/>
36-
<appendField variable="someVar" selector=".functionalTestSelector" userInput="someInput" stepKey="appendFieldKey1" />
36+
<appendField variable="someVar" selector=".functionalTestSelector" stepKey="appendFieldKey1" />
3737
<attachFile userInput="testFileAttachment" selector=".functionalTestSelector" stepKey="attachFileKey1" />
3838
<cancelPopup stepKey="cancelPopupKey1"/>
3939
<checkOption selector=".functionalTestSelector" stepKey="checkOptionKey1"/>
4040
<click selector=".functionalTestSelector" stepKey="clickKey1"/>
4141
<clickWithLeftButton selector=".functionalTestSelector" stepKey="clickWithLeftButtonKey1"/>
4242
<clickWithRightButton selector=".functionalTestSelector" stepKey="clickWithRightButtonKey1"/>
4343
<closeTab stepKey="closeTabKey1"/>
44-
<conditionalClick selector=".functionalTestSelector" dependentSelector=".functionalDependentTestSelector" stepKey="conditionalClickKey1"/>
44+
<conditionalClick selector=".functionalTestSelector" dependentSelector=".functionalDependentTestSelector" visible="true" stepKey="conditionalClickKey1"/>
4545
<dontSee userInput="someInput" selector=".functionalTestSelector" stepKey="dontSeeKey1" />
4646
<dontSeeCheckboxIsChecked selector=".functionalTestSelector" stepKey="dontSeeCheckboxIsCheckedKey1"/>
4747
<dontSeeCookie userInput="someInput" stepKey="dontSeeCookieKey1"/>
@@ -50,7 +50,7 @@
5050
<dontSeeElement selector=".functionalTestSelector" stepKey="dontSeeElementKey1"/>
5151
<dontSeeElementInDOM selector=".functionalTestSelector" stepKey="dontSeeElementInDOMKey1"/>
5252
<dontSeeInCurrentUrl url="/functionalUrl" stepKey="dontSeeInCurrentUrlKey1"/>
53-
<dontSeeInField variable="someVar" selector=".functionalTestSelector" userInput="someInput" stepKey="dontSeeInFieldKey1" />
53+
<dontSeeInField variable="someVar" selector=".functionalTestSelector" stepKey="dontSeeInFieldKey1" />
5454
<dontSeeInPageSource userInput="someInput" stepKey="dontSeeInPageSourceKey1"/>
5555
<dontSeeInSource html="&quot;&lt;myHtmlHere&gt;&quot;" stepKey="dontSeeInSourceKey1"/>
5656
<dontSeeInTitle userInput="someInput" stepKey="dontSeeInTitleKey1"/>

0 commit comments

Comments
 (0)