Skip to content

Commit c4443fe

Browse files
manjusha729manjusha729
committed
Merge branch 'ACQE-6372' into ACQE-6879-functional-mainline-deployment
2 parents ce544f3 + d07b8d6 commit c4443fe

17 files changed

+484
-1
lines changed

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDHLWithoutSpecificCountryConfigurationActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminEnableDHLWithoutSpecificCountryConfigurationActionGroup" extends="AdminEnableDHLConfigurationActionGroup">
12+
<annotations>
13+
<description>Enable DHL shipping method without specific country and their configuration</description>
14+
</annotations>
15+
<remove keyForRemoval="DHLSpecificCountries"/>
16+
<remove keyForRemoval="DHLSelectSpecificCountry"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/Data/DHLConfigData.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,4 +89,9 @@
8989
<data key="label">No</data>
9090
<data key="value">0</data>
9191
</entity>
92+
<entity name="AdminPoundsUnitOfMeasureDHL">
93+
<data key="path">carriers/dhl/unit_of_measure</data>
94+
<data key="label">Pounds</data>
95+
<data key="value">L</data>
96+
</entity>
9297
</entities>

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@
373373
<data key="state">Berlin</data>
374374
<data key="vatNumber">111607872</data>
375375
</entity>
376-
<entity name="US_Address_California">
376+
<entity name="US_Address_California" type="address">
377377
<data key="firstname">John</data>
378378
<data key="lastname">Doe</data>
379379
<data key="company">Magento</data>
@@ -556,6 +556,19 @@
556556
<data key="postcode">32909</data>
557557
<data key="telephone">12345678</data>
558558
</entity>
559+
<entity name="DE_Berlin_State" type="address" extends="DE_Address_Berlin_Not_Default_Address">
560+
<requiredEntity type="region">RegionBER</requiredEntity>
561+
</entity>
562+
<entity name="UK_State_Address" type="address" extends="UK_Not_Default_Address">
563+
<array key="street">
564+
<item>172, Westminster</item>
565+
</array>
566+
<data key="state">California</data>
567+
<requiredEntity type="region">RegionUKGL</requiredEntity>
568+
</entity>
569+
<entity name="US_California_State" type="address" extends="US_Address_California">
570+
<requiredEntity type="region">RegionCA</requiredEntity>
571+
</entity>
559572
<entity name="US_Address_TX_With_RegionID" type="address">
560573
<data key="firstname">John</data>
561574
<data key="lastname">Doe</data>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -503,4 +503,20 @@
503503
<data key="group">General</data>
504504
<requiredEntity type="address">US_Address_CA_CC</requiredEntity>
505505
</entity>
506+
<entity name="Simple_Customer_With_Multiple_Address" type="customer">
507+
<data key="group_id">1</data>
508+
<data key="default_billing">false</data>
509+
<data key="default_shipping">false</data>
510+
<data key="email" unique="prefix">John.Doe@example.com</data>
511+
<data key="firstname">John</data>
512+
<data key="lastname">Doe</data>
513+
<data key="fullname">John Doe</data>
514+
<data key="password">pwdTest123!</data>
515+
<data key="store_id">0</data>
516+
<data key="website_id">0</data>
517+
<requiredEntity type="address">DE_Berlin_State</requiredEntity>
518+
<requiredEntity type="address">UK_State_Address</requiredEntity>
519+
<requiredEntity type="address">US_Address_NY_Not_Default_Address</requiredEntity>
520+
<requiredEntity type="address">US_California_State</requiredEntity>
521+
</entity>
506522
</entities>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,9 @@
4040
<entity name="RegionUKGL" type="region">
4141
<data key="region">Greater London</data>
4242
</entity>
43+
<entity name="RegionBER" type="region">
44+
<data key="region">Berlin</data>
45+
<data key="region_code">BER</data>
46+
<data key="region_id">82</data>
47+
</entity>
4348
</entities>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminDisableUSPSActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminDisableUSPSActionGroup">
12+
<annotations>
13+
<description>Disable United States Postal Service shipping method in backend</description>
14+
</annotations>
15+
<magentoCLI command="config:set {{AdminDisableUSPSConfigData.path}} {{AdminDisableUSPSConfigData.value}}" stepKey="disableUSPS"/>
16+
<magentoCLI command="config:set {{AdminDisableDebugUSPSConfigData.path}} {{AdminDisableDebugUSPSConfigData.value}}" stepKey="disableDebug"/>
17+
<magentoCLI command="config:set {{AdminDisableShowMethodUSPSConfigData.path}} {{AdminDisableShowMethodUSPSConfigData.value}}" stepKey="disableShowMethod"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminEnableUSPSActionGroup.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminEnableUSPSActionGroup">
12+
<annotations>
13+
<description>Enable United States Postal Service shipping method in backend</description>
14+
</annotations>
15+
<magentoCLI command="config:set {{AdminEnableUSPSConfigData.path}} {{AdminEnableUSPSConfigData.value}}" stepKey="enableUSPS"/>
16+
<magentoCLI command="config:set {{AdminUserIDUSPSConfigData.path}} {{AdminUserIDUSPSConfigData.value}}" stepKey="fillUserID"/>
17+
<magentoCLI command="config:set {{AdminPasswordUSPSConfigData.path}} {{AdminPasswordUSPSConfigData.value}}" stepKey="fillPassword"/>
18+
<magentoCLI command="config:set {{AdminEnableDebugUSPSConfigData.path}} {{AdminEnableDebugUSPSConfigData.value}}" stepKey="enableDebug"/>
19+
<magentoCLI command="config:set {{AdminEnableShowMethodUSPSConfigData.path}} {{AdminEnableShowMethodUSPSConfigData.value}}" stepKey="enableShowMethod"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminSelectAddressInShippingInformationActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminSelectAddressInShippingInformationActionGroup">
12+
<arguments>
13+
<argument name="addressSection" type="string"/>
14+
<argument name="selectOption" type="string"/>
15+
</arguments>
16+
<grabTextFrom selector="{{AdminShipmentAddressInformationSection.shippingAddressOptions(addressSection,selectOption)}}" stepKey="firstShippingAddressValue"/>
17+
<selectOption selector="{{AdminShipmentAddressInformationSection.shippingAddressSelector(addressSection)}}" userInput="{$firstShippingAddressValue}" after="firstShippingAddressValue" stepKey="selectFirstShippingMethod"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminUPSDisableActionGroup.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminUPSDisableActionGroup">
12+
<annotations>
13+
<description>Disable UPS shipping method in the configuration section.</description>
14+
</annotations>
15+
<magentoCLI command="config:set {{AdminDisableUPSConfigData.path}} {{AdminDisableUPSConfigData.value}}" stepKey="disableUPS"/>
16+
<magentoCLI command="config:set {{AdminDisableDebugUPSConfigData.path}} {{AdminDisableDebugUPSConfigData.value}}" stepKey="disableDebug"/>
17+
<magentoCLI command="config:set {{AdminDisableShowMethodUPSConfigData.path}} {{AdminDisableShowMethodUPSConfigData.value}}" stepKey="disableShowMethod"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminUPSEnableActionGroup.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminUPSEnableActionGroup">
12+
<annotations>
13+
<description>Enable UPS shipping method in the configuration section.</description>
14+
</annotations>
15+
<magentoCLI command="config:set {{AdminEnableUPSConfigData.path}} {{AdminEnableUPSConfigData.value}}" stepKey="enableUPS"/>
16+
<magentoCLI command="config:set {{AdminAccessLicenseNumberUPSConfigData.path}} {{AdminAccessLicenseNumberUPSConfigData.value}}" stepKey="accessLicenseNumber"/>
17+
<magentoCLI command="config:set {{AdminUserIDUPSConfigData.path}} {{AdminUserIDUPSConfigData.value}}" stepKey="fillUserID"/>
18+
<magentoCLI command="config:set {{AdminPasswordUPSConfigData.path}} {{AdminPasswordUPSConfigData.value}}" stepKey="fillPassword"/>
19+
<magentoCLI command="config:set {{AdminShipperNumberUPSConfigData.path}} {{AdminShipperNumberUPSConfigData.value}}" stepKey="fillShipperNumber"/>
20+
<magentoCLI command="config:set {{AdminEnableDebugUPSConfigData.path}} {{AdminEnableDebugUPSConfigData.value}}" stepKey="enableDebug"/>
21+
<magentoCLI command="config:set {{AdminEnableShowMethodUPSConfigData.path}} {{AdminEnableShowMethodUPSConfigData.value}}" stepKey="enableShowMethod"/>
22+
</actionGroup>
23+
</actionGroups>

0 commit comments

Comments
 (0)