Skip to content

Commit 23d0eec

Browse files
Pavan-bjmohit-adobe
authored andcommitted
ACQE-6765:Admin create shipping label for usps shipping method with international address
- Resolved static failure issue by changing copyright - Modified usps suite
1 parent f01aa1f commit 23d0eec

File tree

3 files changed

+14
-22
lines changed

3 files changed

+14
-22
lines changed

app/code/Magento/Shipping/Test/Mftf/Data/USPSShippingMethodData.xml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2023 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -84,4 +84,12 @@
8484
<data key="path">carriers/usps/mmid</data>
8585
<data key="value">903764661</data>
8686
</entity>
87+
<entity name="AdminRestAPIAllowedAllowedMethodsUSPSConfigData" type="usps_config">
88+
<data key="path">carriers/usps/rest_allowed_methods</data>
89+
<data key="value">LIBRARY_MAIL_MACHINABLE_5-DIGIT,MEDIA_MAIL_MACHINABLE_5-DIGIT,USPS_GROUND_ADVANTAGE_MACHINABLE_SINGLE-PIECE,PRIORITY_MAIL_MACHINABLE_SINGLE-PIECE,PRIORITY_MAIL_FLAT_RATE_ENVELOPE,PRIORITY_MAIL_MACHINABLE_MEDIUM_FLAT_RATE_BOX,PRIORITY_MAIL_MACHINABLE_LARGE_FLAT_RATE_BOX,PRIORITY_MAIL_MACHINABLE_SMALL_FLAT_RATE_BOX,PRIORITY_MAIL_PADDED_FLAT_RATE_ENVELOPE,PRIORITY_MAIL_LEGAL_FLAT_RATE_ENVELOPE,PRIORITY_MAIL_EXPRESS_MACHINABLE_SINGLE-PIECE,PRIORITY_MAIL_EXPRESS_FLAT_RATE_ENVELOPE,PRIORITY_MAIL_EXPRESS_LEGAL_FLAT_RATE_ENVELOPE,FIRST-CLASS_PACKAGE_INTERNATIONAL_SERVICE_MACHINABLE_ISC_SINGLE-PIECE,PRIORITY_MAIL_INTERNATIONAL_ISC_SINGLE-PIECE,PRIORITY_MAIL_INTERNATIONAL_ISC_FLAT_RATE_ENVELOPE</data>
90+
</entity>
91+
<entity name="AdminAllowedAllowedMethodsUSPSConfigData" type="usps_config">
92+
<data key="path">carriers/usps/allowed_methods</data>
93+
<data key="value">0_FCLE,0_FCL,0_FCP,1,2,3,4,6,7,13,16,17,22,23,25,27,28,33,34,35,36,37,42,43,53,57,61,INT_1,INT_2,INT_4,INT_6,INT_7,INT_8,INT_9,INT_10,INT_11,INT_12,INT_13,INT_14,INT_15,INT_16,INT_20,1058,4058,6058,2058,4096,1096,2096,6096</data>
94+
</entity>
8795
</entities>

app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingMethodUSPSSection.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,5 @@
2121
<element name="usernameUSPS" type="input" selector="//input[@id='carriers_usps_userid']"/>
2222
<element name="USPSshowMethodIfNotApplicableField" type="select" selector="//tr[@id='row_carriers_usps_showmethod']//td//select[@id='carriers_usps_showmethod']"/>
2323
<element name="debugSelectUSPS" type="select" selector="//tr[@id='row_carriers_usps_debug']//td//select[@id='carriers_usps_debug']"/>
24-
<element name="allowedMethodsForRestAPICheckbox" type="checkbox" selector="//tr[@id='row_carriers_usps_rest_allowed_methods']//input[@id='carriers_usps_rest_allowed_methods_inherit']"/>
2524
</section>
2625
</sections>

app/code/Magento/Shipping/Test/Mftf/Suite/USPSShippingForRestAPISuite.xml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2025 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
@@ -19,36 +19,21 @@
1919
<magentoCLI command="config:set {{AdminCRIDUSPSConfigData.path}} {{AdminCRIDUSPSConfigData.value}}" stepKey="fillCustomerRegistrationID"/>
2020
<magentoCLI command="config:set {{AdminMIDUSPSConfigData.path}} {{AdminMIDUSPSConfigData.value}}" stepKey="fillMailerIdentifier"/>
2121
<magentoCLI command="config:set {{AdminMMIDUSPSConfigData.path}} {{AdminMMIDUSPSConfigData.value}}" stepKey="fillManifestMID"/>
22+
<magentoCLI command="config:set {{AdminRestAPIAllowedAllowedMethodsUSPSConfigData.path}} {{AdminRestAPIAllowedAllowedMethodsUSPSConfigData.value}}" stepKey="selectAllowedMethods"/>
2223
<magentoCLI command="config:set {{AdminEnableDebugUSPSConfigData.path}} {{AdminEnableDebugUSPSConfigData.value}}" stepKey="enableDebugUSPS"/>
2324
<magentoCLI command="config:set {{AdminEnableShowMethodUSPSConfigData.path}} {{AdminEnableShowMethodUSPSConfigData.value}}" stepKey="enableShowMethodUSPS"/>
24-
<!--Set shipping allowed for all methods-->
25-
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
26-
<conditionalClick selector="{{AdminShippingMethodUSPSSection.USPSTab}}" dependentSelector="{{AdminShippingMethodUSPSSection.carriersUSPSActive}}" visible="false" stepKey="expandUSPSTab"/>
27-
<scrollTo selector="{{AdminShippingMethodUSPSSection.allowedMethodsForRestAPICheckbox}}" stepKey="scrollToAllowedMethodsCheckbox"/>
28-
<checkOption selector="{{AdminShippingMethodUSPSSection.allowedMethodsForRestAPICheckbox}}" stepKey="checkOnAllowedMethodsCheckboxForRestAPIUSPSType"/>
29-
<waitForElementVisible selector="{{AdminConfigSection.saveButton}}" stepKey="waitForShippingMethodSaveButton"/>
30-
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
3125
<!--Flush cache post configuration-->
3226
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCachePostConfiguring">
3327
<argument name="tags" value="config full_page"/>
3428
</actionGroup>
3529
</before>
3630
<after>
37-
<!--Login as Admin-->
38-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
3931
<!--Disable USPS shipping carrier-->
4032
<magentoCLI command="config:set {{AdminDisableUSPSConfigData.path}} {{AdminDisableUSPSConfigData.value}}" stepKey="disableUSPS"/>
4133
<magentoCLI command="config:set {{AdminSetUSPSTypeToUSPSWebToolUSPSConfigData.path}} {{AdminSetUSPSTypeToUSPSWebToolUSPSConfigData.value}}" stepKey="changeUSPSTypeToDeflaut"/>
34+
<magentoCLI command="config:set {{AdminAllowedAllowedMethodsUSPSConfigData.path}} {{AdminAllowedAllowedMethodsUSPSConfigData.value}}" stepKey="selectAllowedMethods"/>
4235
<magentoCLI command="config:set {{AdminDisableDebugUSPSConfigData.path}} {{AdminDisableDebugUSPSConfigData.value}}" stepKey="disableDebugUSPS"/>
4336
<magentoCLI command="config:set {{AdminDisableShowMethodUSPSConfigData.path}} {{AdminDisableShowMethodUSPSConfigData.value}}" stepKey="disableShowMethodUSPS"/>
44-
<!--Set shipping allowed for all methods-->
45-
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
46-
<conditionalClick selector="{{AdminShippingMethodUSPSSection.USPSTab}}" dependentSelector="{{AdminShippingMethodUSPSSection.carriersUSPSActive}}" visible="false" stepKey="expandUSPSTab"/>
47-
<scrollTo selector="{{AdminShippingMethodUSPSSection.carriersUSPSAllowedMethods}}" stepKey="scrollToAllowedMethodsCheckbox"/>
48-
<click selector="{{AdminShippingMethodUSPSSection.carriersUSPSAllowedMethods}}" stepKey="checkOnAllowedMethodsCheckboxForWebToolUSPSType"/>
49-
<waitForElementVisible selector="{{AdminConfigSection.saveButton}}" stepKey="waitForShippingMethodSaveButton"/>
50-
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>
51-
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutAdmin"/>
5237
</after>
5338
<include>
5439
<group name="EnableUSPSShippingForRestAPISuite"/>

0 commit comments

Comments
 (0)