Skip to content

Commit cec419f

Browse files
committed
ACP2E-2763: Table Rates Still Showing Even Though Free Shipping Is Applied
1 parent 1a2560f commit cec419f

File tree

3 files changed

+37
-2
lines changed

3 files changed

+37
-2
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/************************************************************************
4+
*
5+
* Copyright 2024 Adobe
6+
* All Rights Reserved.
7+
*
8+
* NOTICE: All information contained herein is, and remains
9+
* the property of Adobe and its suppliers, if any. The intellectual
10+
* and technical concepts contained herein are proprietary to Adobe
11+
* and its suppliers and are protected by all applicable intellectual
12+
* property laws, including trade secret and copyright laws.
13+
* Dissemination of this information or reproduction of this material
14+
* is strictly forbidden unless prior written permission is obtained
15+
* from Adobe.
16+
* ************************************************************************
17+
*/
18+
-->
19+
20+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
22+
<!-- Enable/Disable Table Rates shipping method -->
23+
<actionGroup name="AdminChangeTableRatesShippingMethodConditionActionGroup">
24+
<arguments>
25+
<argument name="condition" type="string" defaultValue="{{TableRateShippingMethodConfig.package_value_with_discount}}"/>
26+
</arguments>
27+
<conditionalClick selector="{{AdminShippingMethodTableRatesSection.carriersTableRateTab}}" dependentSelector="{{AdminShippingMethodTableRatesSection.carriersTableRateActive}}" visible="false" stepKey="expandTab"/>
28+
<uncheckOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateConditionName}}" stepKey="disableUseDefaultCondition"/>
29+
<selectOption selector="{{AdminShippingMethodTableRatesSection.condition}}" userInput="{{condition}}" stepKey="setCondition"/>
30+
</actionGroup>
31+
</actionGroups>

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<title value="Assert that table rate shipping price will be correct after cart price rule for free shipping applied"/>
2727
<description value="Table rate price should be displayed correctly on checkout after applied free shipment cart price rule"/>
2828
<severity value="AVERAGE"/>
29-
<testCaseId value="ACP2E-2763"/>
29+
<testCaseId value="AC-11402"/>
3030
<useCaseId value="ACP2E-2763"/>
3131
<group value="shipping"/>
3232
<group value="SalesRule"/>
@@ -47,6 +47,9 @@
4747
<actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="enableTableRatesShippingMethodForDefaultWebsite">
4848
<argument name="status" value="1"/>
4949
</actionGroup>
50+
<actionGroup ref="AdminChangeTableRatesShippingMethodConditionActionGroup" stepKey="selectPriceVsDestinationCondition">
51+
<argument name="condition" value="{{TableRateShippingMethodConfig.package_value_with_discount}}"/>
52+
</actionGroup>
5053
<actionGroup ref="AdminImportFileTableRatesShippingMethodActionGroup" stepKey="importCSVFile">
5154
<argument name="file" value="price_tablerates.csv"/>
5255
</actionGroup>
@@ -85,6 +88,7 @@
8588
<actionGroup ref="AdminChangeTableRatesShippingMethodStatusActionGroup" stepKey="disableTableRatesShippingMethodForDefaultWebsite">
8689
<argument name="status" value="0"/>
8790
</actionGroup>
91+
<checkOption selector="{{AdminShippingMethodTableRatesSection.carriersTableRateConditionName}}" stepKey="disableUseDefaultCondition"/>
8892
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfig2"/>
8993

9094
<!-- Disable free shipping method -->

dev/tests/acceptance/tests/_data/price_tablerates.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ Country,Region/State,Zip/Postal Code,Order Subtotal (and above),Shipping Price
22
USA,*,*,0,15.9500
33
USA,*,*,100.0000,0.0000
44
USA,AK,*,0.0000,0.0000
5-
USA,HI,*,0.0000,0.0000
5+
USA,HI,*,0.0000,0.0000

0 commit comments

Comments
 (0)