Skip to content

Commit dcd0dbc

Browse files
authored
Merge pull request magento#2079 from magento-pangolin/MQE-741-2.2-develop
[Pangolin] Deliver test fixes - MQE-741: Two steps with same step key, the later step will overwrite the previous step - MQE-792: Fixed StorefrontCustomerCheckoutTest test
2 parents 53c9efb + 2bc075d commit dcd0dbc

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/Checkout/Test/StorefrontCustomerCheckoutTest.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,14 @@
7575
<see stepKey="s91" selector="{{OrderDetailsInformationSection.billingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
7676
<see stepKey="s93" selector="{{OrderDetailsInformationSection.shippingAddress}}" userInput="{{US_Address_TX.street[0]}}" />
7777
<see stepKey="s95" selector="{{OrderDetailsInformationSection.itemsOrdered}}" userInput="$$simpleproduct1.name$$" />
78+
<amOnPage stepKey="s96" url="{{AdminCustomerPage.url}}"/>
79+
<waitForPageLoad stepKey="s97"/>
80+
<click stepKey="s98" selector="{{AdminCustomerFiltersSection.filtersButton}}"/>
81+
<fillField stepKey="s99" selector="{{AdminCustomerFiltersSection.emailInput}}" userInput="$$simpleuscustomer.email$$"/>
82+
<click stepKey="s100" selector="{{AdminCustomerFiltersSection.apply}}"/>
83+
<click stepKey="s101" selector="{{AdminCustomerGridSection.firstRowEditLink}}"/>
84+
<click stepKey="s102" selector="{{AdminEditCustomerInformationSection.orders}}"/>
85+
<see stepKey="s103" selector="{{AdminEditCustomerOrdersSection.orderGrid}}" userInput="{$s53}" />
86+
<see stepKey="s104" selector="{{AdminEditCustomerOrdersSection.orderGrid}}" userInput="$$simpleuscustomer.firstname$$ $$simpleuscustomer.lastname$$" />
7887
</test>
7988
</tests>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTemplates/Test/TemplateTestFile.xml

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

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Test/etc/testSchema.xsd">
11-
<test name="">
11+
<test name="templateTestFile">
1212
<annotations>
1313
<features value=""/>
1414
<stories value=""/>

dev/tests/acceptance/tests/functional/Magento/FunctionalTest/SampleTests/Test/SampleTest.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
<dontSeeCookie userInput="cookieName" stepKey="dontSeeCookie1"/>
5757
<dontSeeCookie userInput="cookieName" parameterArray="['domainName' => 'stuff']" stepKey="dontSeeCookie2"/>
5858
<dontSeeCurrentUrlEquals url="/stuff" stepKey="dontSeeCurrentUrlEquals"/>
59-
<dontSeeCurrentUrlMatches url="~$/users/(\d+)~" stepKey="dontSeeCurrentUrlMatches"/>
59+
<dontSeeCurrentUrlMatches regex="~$/users/(\d+)~" stepKey="dontSeeCurrentUrlMatches"/>
6060
<dontSeeElement selector=".error" stepKey="dontSeeElement1"/>
6161
<dontSeeElement selector="input" parameterArray="['name' => 'login']" stepKey="dontSeeElement2"/>
6262
<dontSeeElementInDOM selector="#stuff" stepKey="dontSeeElementInDOM1"/>
@@ -79,7 +79,7 @@
7979
<fillField selectorArray="['name' => 'email']" userInput="stuff" stepKey="fillField2"/>
8080
<grabAttributeFrom selector="#target" userInput="title" stepKey="grabAttributeFrom"/>
8181
<grabCookie userInput="cookie" parameterArray="['domain' => 'www.google.com']" stepKey="grabCookie"/>
82-
<grabFromCurrentUrl url="~$/user/(\d+)/~" stepKey="grabFromCurrentUrl"/>
82+
<grabFromCurrentUrl regex="~$/user/(\d+)/~" stepKey="grabFromCurrentUrl"/>
8383
<grabMultiple selector="a" userInput="href" stepKey="grabMultiple"/>
8484
<grabPageSource stepKey="grabPageSource1"/>
8585
<grabTextFrom selector="h1" stepKey="grabTextFrom1"/>
@@ -119,7 +119,7 @@
119119
<seeCookie userInput="PHPSESSID" stepKey="seeCookie1"/>
120120
<seeCookie userInput="PHPSESSID" parameterArray="['domainName' => 'www.google.com']" stepKey="seeCookie2"/>
121121
<seeCurrentUrlEquals url="/" stepKey="seeCurrentUrlEquals"/>
122-
<seeCurrentUrlMatches url="~$/users/(\d+)~" stepKey="seeCurrentUrlMatches"/>
122+
<seeCurrentUrlMatches regex="~$/users/(\d+)~" stepKey="seeCurrentUrlMatches"/>
123123
<seeElement selector=".error" stepKey="seeElement1"/>
124124
<seeElement selectorArray="['css' => 'form input']" stepKey="seeElement2"/>
125125
<seeElement selector=".error" parameterArray="['name' => 'login']" stepKey="seeElement3"/>
@@ -217,7 +217,7 @@
217217
<dontSee userInput="{$randomStuff}" stepKey="dontSee1"/>
218218
<dontSeeCookie userInput="{$randomStuff}" stepKey="dontSeeCookie1"/>
219219
<dontSeeCurrentUrlEquals url="{$randomStuff}" stepKey="dontSeeCurrentUrlEquals1"/>
220-
<dontSeeCurrentUrlMatches url="{$randomStuff}" stepKey="dontSeeCurrentUrlMatches1"/>
220+
<dontSeeCurrentUrlMatches regex="{$randomStuff}" stepKey="dontSeeCurrentUrlMatches1"/>
221221
<dontSeeInCurrentUrl url="{$randomStuff}" stepKey="dontSeeInCurrentUrl1"/>
222222
<dontSeeInField selector="#stuff" userInput="{$randomStuff}" stepKey="dontSeeInField1"/>
223223
<dontSeeInPageSource userInput="{$randomStuff}" stepKey="dontSeeInPageSource1"/>
@@ -227,15 +227,15 @@
227227
<fillField userInput="{$randomStuff}" selector="#field" stepKey="fillField1"/>
228228
<grabAttributeFrom selector="#stuff" userInput="{$randomStuff}" stepKey="grabAttributeFrom1"/>
229229
<grabCookie userInput="{$randomStuff}" stepKey="grabValueFrom1"/>
230-
<grabFromCurrentUrl url="{$randomStuff}" stepKey="grabFromCurrentUrl"/>
230+
<grabFromCurrentUrl regex="{$randomStuff}" stepKey="grabFromCurrentUrl"/>
231231
<grabMultiple selector="a" userInput="{$randomStuff}" stepKey="grabMultiple1"/>
232232
<loadSessionSnapshot userInput="{$randomStuff}" stepKey="loadSessionSnapshot"/>
233233
<pressKey selector="a" userInput="{$randomStuff}" stepKey="pressKey1"/>
234234
<saveSessionSnapshot userInput="{$randomStuff}" stepKey="saveSessionSnapshot1"/>
235235
<see userInput="{$randomStuff}" stepKey="see1"/>
236236
<seeCookie userInput="{$randomStuff}" stepKey="seeCookie1"/>
237237
<seeCurrentUrlEquals url="{$randomStuff}" stepKey="seeCurrentUrlEquals1"/>
238-
<seeCurrentUrlMatches url="{$randomStuff}" stepKey="seeCurrentUrlMatches1"/>
238+
<seeCurrentUrlMatches regex="{$randomStuff}" stepKey="seeCurrentUrlMatches1"/>
239239
<seeInCurrentUrl url="{$randomStuff}" stepKey="seeInCurrentUrl1"/>
240240
<seeInField selector="a" userInput="{$randomStuff}" stepKey="seeInField1"/>
241241
<seeInPopup userInput="{$randomStuff}" stepKey="seeInPopup"/>
@@ -245,9 +245,9 @@
245245
<seeOptionIsSelected selector="#stuff" userInput="{$randomStuff}" stepKey="seeOptionIsSelected1"/>
246246
<selectOption selector="#stuff" userInput="{$randomStuff}" stepKey="selectOption1"/>
247247
<switchToIFrame userInput="{$randomStuff}" stepKey="switchToIFrame1"/>
248-
<switchToNextTab userInput="{$randomStuff}" stepKey="switchToNextTab1"/>
248+
<switchToNextTab userInput="{$randomStuff}" stepKey="switchToNextTab2"/>
249249
<switchToPreviousTab userInput="{$randomStuff}" stepKey="switchToPreviousTab1"/>
250-
<switchToNextTab userInput="{$randomStuff}" stepKey="switchToNextTab1"/>
250+
<switchToNextTab userInput="{$randomStuff}" stepKey="switchToNextTab3"/>
251251
<switchToWindow userInput="{$randomStuff}" stepKey="switchToWindow1"/>
252252
<typeInPopup userInput="{$randomStuff}" stepKey="typeInPopup"/>
253253
<unselectOption selector="#option" userInput="{$randomStuff}" stepKey="unselectOption1"/>

0 commit comments

Comments
 (0)