Skip to content

Commit d6ad4df

Browse files
Neil RautNeil Raut
authored andcommitted
ACQE-5765: Place order using USPS Shipping carrier
Deleted AG, moved CLI commands to Suites - PR working this way only.
1 parent 624c64c commit d6ad4df

File tree

6 files changed

+28
-87
lines changed

6 files changed

+28
-87
lines changed

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

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

Lines changed: 0 additions & 32 deletions
This file was deleted.

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,4 @@
2020
<data key="applicableCountries">All Allowed Countries</data>
2121
<data key="showIfNotApplicable">No</data>
2222
</entity>
23-
<entity name="USPSShippingMethodConfig" type="shipping">
24-
<data key="enableCheckoutSelectUSPS">Yes</data>
25-
<data key="gatewayURLInputUSPS">http://production.shippingapis.com/ShippingAPI.dll</data>
26-
<data key="secureGatewayURLInputUSPS">https://secure.shippingapis.com/ShippingAPI.dll</data>
27-
<data key="USPSshowMethodIfNotApplicableField">Yes</data>
28-
<data key="debugSelectUSPS">Yes</data>
29-
</entity>
3023
</entities>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?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-
-->
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
88

99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
<?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-
-->
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
88
<suites xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Suite/etc/suiteSchema.xsd">
99
<suite name="USPSShippingSuite">
1010
<before>
1111
<!--Login as Admin-->
1212
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
13-
<!--Navigate to shipping method configuration-->
14-
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPageToEnableUSPS"/>
1513
<!--Configure USPS shipping method-->
16-
<actionGroup ref="AdminEnableUSPSActionGroup" stepKey="configureUSPSShippingMethod">
17-
<argument name="shipping" value="USPSShippingMethodConfig"/>
18-
</actionGroup>
19-
<!--Cache flush-->
14+
<magentoCLI command="config:set {{AdminEnableUSPSConfigData.path}} {{AdminEnableUSPSConfigData.value}}" stepKey="enableUSPS"/>
15+
<magentoCLI command="config:set {{AdminUserIDUSPSConfigData.path}} {{AdminUserIDUSPSConfigData.value}}" stepKey="fillUserIDUSPS"/>
16+
<magentoCLI command="config:set {{AdminPasswordUSPSConfigData.path}} {{AdminPasswordUSPSConfigData.value}}" stepKey="fillPasswordUSPS"/>
17+
<magentoCLI command="config:set {{AdminEnableDebugUSPSConfigData.path}} {{AdminEnableDebugUSPSConfigData.value}}" stepKey="enableDebugUSPS"/>
18+
<magentoCLI command="config:set {{AdminEnableShowMethodUSPSConfigData.path}} {{AdminEnableShowMethodUSPSConfigData.value}}" stepKey="enableShowMethodUSPS"/>
19+
<!--Flush cache post configuration-->
2020
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCachePostConfiguring">
2121
<argument name="tags" value="config full_page"/>
2222
</actionGroup>
2323
</before>
2424
<after>
25-
<!--Navigate to shipping method configuration-->
26-
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPageToDisableUSPS"/>
2725
<!--Disable USPS shipping carrier-->
28-
<actionGroup ref="AdminDisableUSPSActionGroup" stepKey="disableUSPS"/>
26+
<magentoCLI command="config:set {{AdminDisableUSPSConfigData.path}} {{AdminDisableUSPSConfigData.value}}" stepKey="disableUSPS"/>
27+
<magentoCLI command="config:set {{AdminDisableDebugUSPSConfigData.path}} {{AdminDisableDebugUSPSConfigData.value}}" stepKey="disableDebugUSPS"/>
28+
<magentoCLI command="config:set {{AdminDisableShowMethodUSPSConfigData.path}} {{AdminDisableShowMethodUSPSConfigData.value}}" stepKey="disableShowMethodUSPS"/>
2929
</after>
3030
<include>
3131
<group name="EnableUSPSShippingSuite"/>

app/code/Magento/Shipping/Test/Mftf/Test/AdminPlaceOrderWithUSPSOnlineShippingCarrierTest.xml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?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-
-->
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
@@ -18,7 +18,7 @@
1818
<features value="Shipping"/>
1919
<group value="3rd_party_integration"/>
2020
<group value="EnableUSPSShippingSuite"/>
21-
<!-- <group value="pr_exclude"/>-->
21+
<!-- <group value="pr_exclude"/>-->
2222
</annotations>
2323
<before>
2424
<!--Login as Admin-->

0 commit comments

Comments
 (0)