Skip to content

Commit 5867a48

Browse files
p-bystritskyp-bystritsky
committed
ENGCOM-4238: MFTF test fix.
1 parent 8b99ea2 commit 5867a48

File tree

3 files changed

+32
-27
lines changed

3 files changed

+32
-27
lines changed

‎app/code/Magento/Customer/Test/Mftf/Data/AddressData.xml

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -51,23 +51,6 @@
5151
<data key="default_shipping">Yes</data>
5252
<requiredEntity type="region">RegionTX</requiredEntity>
5353
</entity>
54-
<entity name="US_address_TX_Wrong_Validation" type="address">
55-
<data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</data>
56-
<data key="lastname">Doe</data>
57-
<data key="company">Magento</data>
58-
<array key="street">
59-
<item>7700 West Parmer Lane</item>
60-
</array>
61-
<data key="city">Austin</data>
62-
<data key="state">Texas</data>
63-
<data key="country_id">US</data>
64-
<data key="country">United States</data>
65-
<data key="postcode">78729</data>
66-
<data key="telephone">512-345-6789</data>
67-
<data key="default_billing">Yes</data>
68-
<data key="default_shipping">Yes</data>
69-
<requiredEntity type="region">RegionTX</requiredEntity>
70-
</entity>
7154
<entity name="US_Address_TX_Default_Billing" type="address">
7255
<data key="firstname">John</data>
7356
<data key="lastname">Doe</data>

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerData.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,19 @@
4545
<data key="website_id">0</data>
4646
<requiredEntity type="address">US_Address_TX</requiredEntity>
4747
</entity>
48+
<entity name="Simple_US_Customer_Incorrect_Name" type="customer">
49+
<data key="group_id">1</data>
50+
<data key="default_billing">true</data>
51+
<data key="default_shipping">true</data>
52+
<data key="email" unique="prefix">John.Doe@example.com</data>
53+
<data key="firstname">LoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsumLoremIpsum</data>
54+
<data key="lastname">Doe</data>
55+
<data key="fullname">John Doe</data>
56+
<data key="password">pwdTest123!</data>
57+
<data key="store_id">0</data>
58+
<data key="website_id">0</data>
59+
<requiredEntity type="address">US_Address_TX</requiredEntity>
60+
</entity>
4861
<entity name="Simple_Customer_Without_Address" type="customer">
4962
<data key="group_id">1</data>
5063
<data key="email" unique="prefix">John.Doe@example.com</data>

‎app/code/Magento/Sales/Test/Mftf/Test/AdminSubmitsOrderWithAndWithoutFieldsValidationTest.xml

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,13 @@
4949
<fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Simple_US_Customer.email}}" stepKey="fillCustomerEmail" after="selectCustomerGroup"/>
5050

5151
<!--Fill wrong customer address information-->
52-
<actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="fillCustomerEmail">
53-
<argument name="customer" value="Simple_US_Customer"/>
54-
<argument name="address" value="US_address_TX_Wrong_Validation"/>
52+
<actionGroup ref="fillOrderCustomerInformation" stepKey="fillWrongCustomerAddress" after="fillCustomerEmail">
53+
<argument name="customer" value="Simple_US_Customer_Incorrect_Name"/>
54+
<argument name="address" value="US_Address_TX"/>
5555
</actionGroup>
5656
<!-- Select shipping -->
57-
<actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping" after="fillCustomerAddress"/>
57+
<actionGroup ref="orderSelectFlatRateShipping" stepKey="selectFlatRateShipping"
58+
after="fillWrongCustomerAddress"/>
5859

5960
<!--Verify totals on Order page-->
6061
<see selector="{{AdminOrderFormTotalSection.total('Subtotal')}}" userInput="${{AdminOrderSimpleProduct.subtotal}}" stepKey="seeOrderSubTotal" after="selectFlatRateShipping"/>
@@ -63,17 +64,25 @@
6364
<see selector="{{AdminOrderFormTotalSection.grandTotal}}" userInput="${{AdminOrderSimpleProduct.grandTotal}}" stepKey="seeCorrectGrandTotal" after="scrollToOrderGrandTotal"/>
6465

6566
<!--Submit Order and verify information-->
66-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="seeCorrectGrandTotal"/>
67-
<see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}" userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError" after="clickSubmitOrder"/>
67+
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrderWrong"
68+
after="seeCorrectGrandTotal"/>
69+
<see selector="{{AdminOrderFormBillingAddressSection.firstNameError}}"
70+
userInput="Please enter less or equal than 255 symbols." stepKey="firstNameError"
71+
after="clickSubmitOrderWrong"/>
6872

6973
<!--Fill correct customer address information-->
7074
<actionGroup ref="fillOrderCustomerInformation" stepKey="fillCustomerAddress" after="firstNameError">
7175
<argument name="customer" value="Simple_US_Customer"/>
72-
<argument name="address" value="US_address_TX"/>
76+
<argument name="address" value="US_Address_TX"/>
7377
</actionGroup>
78+
79+
<!-- Select shipping -->
80+
<click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="clickShipping" after="fillCustomerAddress"/>
81+
<click selector="{{AdminOrderFormPaymentSection.getShippingMethods}}" stepKey="selectShipping" after="clickShipping"/>
82+
7483
<!--Submit Order and verify information-->
75-
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="fillCustomerAddress"/>
84+
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder" after="selectShipping"/>
7685
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage" after="clickSubmitOrder"/>
7786
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage" after="seeViewOrderPage"/>
78-
</test>
79-
</tests>
87+
</test>
88+
</tests>

0 commit comments

Comments
 (0)