Skip to content

Commit 77e5943

Browse files
zakdmazakdma
committed
Merge remote-tracking branch 'origin/imported-magento-magento2-31850' into 2.4-develop-pr122
2 parents d8c26bc + 09aec3d commit 77e5943

File tree

6 files changed

+160
-0
lines changed

6 files changed

+160
-0
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,9 @@
198198
</array>
199199
<data key="state">California</data>
200200
</entity>
201+
<entity name="US_With_Vat_Number" type="address" extends="US_Address_CA">
202+
<data key="vat_id">U1234567891</data>
203+
</entity>
201204
<entity name="US_Default_Billing_Address_TX" type="address" extends="US_Address_TX">
202205
<data key="default_billing">false</data>
203206
<data key="default_shipping">true</data>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@
233233
<data key="website_id">0</data>
234234
<requiredEntity type="address">UK_Not_Default_Address</requiredEntity>
235235
</entity>
236+
<entity name="Customer_With_Vat_Number" type="customer" extends="Simple_Customer_Without_Address">
237+
<requiredEntity type="address">US_With_Vat_Number</requiredEntity>
238+
</entity>
236239
<entity name="Customer_With_Different_Default_Billing_Shipping_Addresses" type="customer">
237240
<data key="group_id">1</data>
238241
<data key="email" unique="prefix">[email protected]</data>

‎app/code/Magento/Sales/Test/Mftf/ActionGroup/AssertAdminBillingAddressFieldsOnOrderCreateFormActionGroup.xml

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AssertAdminBillingAddressFieldsOnOrderCreateFormActionGroup">
11+
<annotations>
12+
<description>Admin assert fields filled default billing address from customer</description>
13+
</annotations>
14+
<arguments>
15+
<argument name="namePrefix" type="string" defaultValue=""/>
16+
<argument name="firstName" type="string" defaultValue="{{US_Address_CA.firstname}}"/>
17+
<argument name="middleName" type="string" defaultValue=""/>
18+
<argument name="lastName" type="string" defaultValue="{{US_Address_CA.lastname}}"/>
19+
<argument name="nameSuffix" type="string" defaultValue=""/>
20+
<argument name="company" type="string" defaultValue="{{US_Address_CA.company}}"/>
21+
<argument name="streetLine1" type="string" defaultValue="{{US_Address_CA.street[0]}}"/>
22+
<argument name="streetLine2" type="string" defaultValue="{{US_Address_CA.street[1]}}"/>
23+
<argument name="country" type="string" defaultValue="{{US_Address_CA.country}}"/>
24+
<argument name="state" type="string" defaultValue="{{US_Address_CA.state}}"/>
25+
<argument name="province" type="string" defaultValue=""/>
26+
<argument name="city" type="string" defaultValue="{{US_Address_CA.city}}"/>
27+
<argument name="postcode" type="string" defaultValue="{{US_Address_CA.postcode}}"/>
28+
<argument name="phone" type="string" defaultValue="{{US_Address_CA.telephone}}"/>
29+
<argument name="fax" type="string" defaultValue=""/>
30+
<argument name="vatNumber" type="string" defaultValue="{{US_With_Vat_Number.vat_id}}"/>
31+
</arguments>
32+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.NamePrefix}}" stepKey="getNamePrefix"/>
33+
<assertEquals stepKey="assertNamePrefix">
34+
<expectedResult type="string">{{namePrefix}}</expectedResult>
35+
<actualResult type="variable">getNamePrefix</actualResult>
36+
</assertEquals>
37+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.FirstName}}" stepKey="getFirstName"/>
38+
<assertEquals stepKey="assertFirstName">
39+
<expectedResult type="string">{{firstName}}</expectedResult>
40+
<actualResult type="variable">getFirstName</actualResult>
41+
</assertEquals>
42+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.MiddleName}}" stepKey="getMiddleName"/>
43+
<assertEquals stepKey="assertMiddleName">
44+
<expectedResult type="string">{{middleName}}</expectedResult>
45+
<actualResult type="variable">getMiddleName</actualResult>
46+
</assertEquals>
47+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.LastName}}" stepKey="getLastName"/>
48+
<assertEquals stepKey="assertLastName">
49+
<expectedResult type="string">{{lastName}}</expectedResult>
50+
<actualResult type="variable">getLastName</actualResult>
51+
</assertEquals>
52+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.NameSuffix}}" stepKey="getNameSuffix"/>
53+
<assertEquals stepKey="assertNameSuffix">
54+
<expectedResult type="string">{{nameSuffix}}</expectedResult>
55+
<actualResult type="variable">getNameSuffix</actualResult>
56+
</assertEquals>
57+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Company}}" stepKey="getCompany"/>
58+
<assertEquals stepKey="assertCompany">
59+
<expectedResult type="string">{{company}}</expectedResult>
60+
<actualResult type="variable">getCompany</actualResult>
61+
</assertEquals>
62+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.StreetLine1}}" stepKey="getStreetLine1"/>
63+
<assertEquals stepKey="assertStreetLine1">
64+
<expectedResult type="string">{{streetLine1}}</expectedResult>
65+
<actualResult type="variable">getStreetLine1</actualResult>
66+
</assertEquals>
67+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.StreetLine2}}" stepKey="getStreetLine2"/>
68+
<assertEquals stepKey="assertStreetLine2">
69+
<expectedResult type="string">{{streetLine2}}</expectedResult>
70+
<actualResult type="variable">getStreetLine2</actualResult>
71+
</assertEquals>
72+
<grabTextFrom selector="{{AdminOrderFormBillingAddressSection.countrySelectedOption}}" stepKey="getCountrySelectedOption"/>
73+
<assertEquals stepKey="assertCountrySelectedOption">
74+
<expectedResult type="string">{{country}}</expectedResult>
75+
<actualResult type="variable">getCountrySelectedOption</actualResult>
76+
</assertEquals>
77+
<grabTextFrom selector="{{AdminOrderFormBillingAddressSection.stateSelectedOption}}" stepKey="getStateSelectedOption"/>
78+
<assertEquals stepKey="assertStateSelectedOption">
79+
<expectedResult type="string">{{state}}</expectedResult>
80+
<actualResult type="variable">getStateSelectedOption</actualResult>
81+
</assertEquals>
82+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Province}}" stepKey="getProvince"/>
83+
<assertEquals stepKey="assertProvince">
84+
<expectedResult type="string">{{province}}</expectedResult>
85+
<actualResult type="variable">getProvince</actualResult>
86+
</assertEquals>
87+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.City}}" stepKey="getCity"/>
88+
<assertEquals stepKey="assertCity">
89+
<expectedResult type="string">{{city}}</expectedResult>
90+
<actualResult type="variable">getCity</actualResult>
91+
</assertEquals>
92+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.PostalCode}}" stepKey="getPostCode"/>
93+
<assertEquals stepKey="assertPostCode">
94+
<expectedResult type="string">{{postcode}}</expectedResult>
95+
<actualResult type="variable">getPostCode</actualResult>
96+
</assertEquals>
97+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Phone}}" stepKey="getPhone"/>
98+
<assertEquals stepKey="assertPhone">
99+
<expectedResult type="string">{{phone}}</expectedResult>
100+
<actualResult type="variable">getPhone</actualResult>
101+
</assertEquals>
102+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.Fax}}" stepKey="getFax"/>
103+
<assertEquals stepKey="assertFax">
104+
<expectedResult type="string">{{fax}}</expectedResult>
105+
<actualResult type="variable">getFax</actualResult>
106+
</assertEquals>
107+
<grabValueFrom selector="{{AdminOrderFormBillingAddressSection.VatNumber}}" stepKey="getVatNumber"/>
108+
<assertEquals stepKey="assertVatNumber">
109+
<expectedResult type="string">{{vatNumber}}</expectedResult>
110+
<actualResult type="variable">getVatNumber</actualResult>
111+
</assertEquals>
112+
</actionGroup>
113+
</actionGroups>

‎app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormBillingAddressSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@
2020
<element name="StreetLine2" type="input" selector="#order-billing_address_street1" timeout="30"/>
2121
<element name="City" type="input" selector="#order-billing_address_city" timeout="30"/>
2222
<element name="Country" type="select" selector="#order-billing_address_country_id" timeout="30"/>
23+
<element name="countrySelectedOption" type="select" selector="#order-billing_address_country_id option:checked"/>
2324
<element name="State" type="select" selector="#order-billing_address_region_id" timeout="30"/>
25+
<element name="stateSelectedOption" type="select" selector="#order-billing_address_region_id option:checked"/>
2426
<element name="Province" type="input" selector="#order-billing_address_region" timeout="30"/>
2527
<element name="PostalCode" type="input" selector="#order-billing_address_postcode" timeout="30"/>
2628
<element name="Phone" type="input" selector="#order-billing_address_telephone" timeout="30"/>

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

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminCheckingFieldsFilledFromDefaultBillingAddressCustomerInNewOrderTest">
11+
<annotations>
12+
<features value="Sales"/>
13+
<stories value="Create order in Admin"/>
14+
<title value="Checking fields filled from default billing address customer"/>
15+
<description value="Checking fields filled from default billing address customer on create new order page"/>
16+
<severity value="AVERAGE"/>
17+
<testCaseId value="MC-40646"/>
18+
<useCaseId value="MC-37657"/>
19+
<group value="sales"/>
20+
<group value="customer"/>
21+
</annotations>
22+
<before>
23+
<createData entity="Customer_With_Vat_Number" stepKey="createCustomer"/>
24+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
25+
</before>
26+
<after>
27+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
28+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
29+
</after>
30+
31+
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="navigateToNewOrderWithExistingCustomer">
32+
<argument name="customer" value="$createCustomer$"/>
33+
</actionGroup>
34+
<actionGroup ref="AssertAdminBillingAddressFieldsOnOrderCreateFormActionGroup" stepKey="assertFieldsFilled"/>
35+
</test>
36+
</tests>

‎app/code/Magento/Sales/etc/fieldset.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -774,6 +774,9 @@
774774
<field name="fax">
775775
<aspect name="to_quote_address" />
776776
</field>
777+
<field name="vat_id">
778+
<aspect name="to_quote_address" />
779+
</field>
777780
</fieldset>
778781
<fieldset id="order_address">
779782
<field name="prefix">

0 commit comments

Comments
 (0)