Skip to content

Commit 48ea90d

Browse files
glo74186glo74186
committed
ACQE-7178 : Admin Uses DHL AP Online Shipping Carrier On Checkout
created testcase
1 parent 88660e7 commit 48ea90d

File tree

5 files changed

+209
-4
lines changed

5 files changed

+209
-4
lines changed

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutCartSummarySection.xml

Lines changed: 3 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 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88

@@ -42,5 +42,6 @@
4242
<element name="fptAmount" type="text" selector="//*[@id='cart-totals']//tr[@class='totals']//td[@class='amount']/span"/>
4343
<element name="canadaTaxAmount" type="text" selector="//span[@data-th='Canada-GST-5%']"/>
4444
<element name="canadaPstTaxAmount" type="text" selector="//span[@data-th='Canada-GST-PST-5%']"/>
45+
<element name="shippingMethods" type="text" selector="//label[text()='{{deliveryMethod}}']" parameterized="true"/>
4546
</section>
4647
</sections>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDHLAPWithoutAccountAndCountryConfigurationActionGroup.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 2024 Adobe
5+
* All Rights Reserved.
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="AdminEnableDHLAPWithoutAccountAndCountryConfigurationActionGroup" extends="AdminEnableDHLConfigurationActionGroup">
12+
<annotations>
13+
<description>Admin Enable DHL shipping method with AP without account number and specific country</description>
14+
</annotations>
15+
<remove keyForRemoval="DHLAccount"/>
16+
<remove keyForRemoval="DHLSpecificCountries"/>
17+
<remove keyForRemoval="DHLSelectSpecificCountry"/>
18+
</actionGroup>
19+
</actionGroups>

‎app/code/Magento/Dhl/Test/Mftf/Test/AdminUsesDHLAPOnlineShippingCarrierOnCheckoutAsARegisteredCustomerTest.xml

Lines changed: 163 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,163 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright 2024 Adobe
5+
* All Rights Reserved.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminUsesDHLAPOnlineShippingCarrierOnCheckoutAsARegisteredCustomerTest">
12+
<annotations>
13+
<stories value="DHL Shipping Carrier On Checkout "/>
14+
<title value="Admin Uses DHL AP Online Shipping Carrier On Checkout"/>
15+
<description value="Admin Uses DHL(AP) Online Shipping Carrier On Checkout As A Registered Customer"/>
16+
<severity value="CRITICAL"/>
17+
<testCaseId value="AC-5026"/>
18+
</annotations>
19+
<before>
20+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
21+
<createData entity="Customer_US_UK_DE" stepKey="createCustomer"/>
22+
<actionGroup ref="AdminSetShippingOriginConfigForStateFieldActionGroup" stepKey="setShippingOriginConfiguration">
23+
<argument name="country" value="Singapore"/>
24+
<argument name="postcode" value="408898"/>
25+
</actionGroup>
26+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="goToCurrencySetupPage"/>
27+
<!--Open currency options and select singapore dollar as allowed currency-->
28+
<conditionalClick selector="{{AdminConfigSection.currencyOptionsTab}}" dependentSelector="{{AdminConfigSection.defaultCurrencySelect}}" visible="false" stepKey="openCurrencyOptionsTab"/>
29+
<selectOption selector="{{AdminConfigSection.allowedCurrencies}}" parameterArray="['Singapore Dollar', 'US Dollar']" stepKey="selectAllowedCurrency"/>
30+
<actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveStoreConfiguration"/>
31+
<!-- go to currency rate page and fill currency rate -->
32+
<actionGroup ref="AdminOpenCurrencyRatesPageActionGroup" stepKey="naviagteToCurrencyRatesPage"/>
33+
<actionGroup ref="AdminSetCurrencyRatesActionGroup" stepKey="setCurrencyRates">
34+
<argument name="firstCurrency" value="USD"/>
35+
<argument name="secondCurrency" value="SGD"/>
36+
<argument name="rate" value="1.35"/>
37+
</actionGroup>
38+
<!--Create category and simple product-->
39+
<createData entity="ApiCategory" stepKey="createCategory"/>
40+
<createData entity="SimpleProduct" stepKey="createSimpleProduct">
41+
<requiredEntity createDataKey="createCategory"/>
42+
</createData>
43+
<!-- Create configurable product with two options -->
44+
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
45+
<requiredEntity createDataKey="createCategory"/>
46+
</createData>
47+
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
48+
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption">
49+
<requiredEntity createDataKey="createConfigProductAttribute"/>
50+
</createData>
51+
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
52+
<requiredEntity createDataKey="createConfigProductAttribute"/>
53+
</createData>
54+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption">
55+
<requiredEntity createDataKey="createConfigProductAttribute"/>
56+
</getData>
57+
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct">
58+
<requiredEntity createDataKey="createConfigProductAttribute"/>
59+
<requiredEntity createDataKey="getConfigAttributeOption"/>
60+
<requiredEntity createDataKey="createCategory"/>
61+
</createData>
62+
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
63+
<requiredEntity createDataKey="createConfigProduct"/>
64+
<requiredEntity createDataKey="createConfigProductAttribute"/>
65+
<requiredEntity createDataKey="getConfigAttributeOption"/>
66+
</createData>
67+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChildOne">
68+
<requiredEntity createDataKey="createConfigProduct"/>
69+
<requiredEntity createDataKey="createConfigChildProduct"/>
70+
</createData>
71+
<!--Create Bundle product with multi select option-->
72+
<createData entity="BundleProductPriceViewRange" stepKey="createBundleProduct">
73+
<requiredEntity createDataKey="createCategory"/>
74+
</createData>
75+
<createData entity="MultipleSelectOption" stepKey="createBundleOption1_1">
76+
<requiredEntity createDataKey="createBundleProduct"/>
77+
<field key="required">True</field>
78+
</createData>
79+
<createData entity="ApiBundleLink" stepKey="linkOptionToProduct">
80+
<requiredEntity createDataKey="createBundleProduct"/>
81+
<requiredEntity createDataKey="createBundleOption1_1"/>
82+
<requiredEntity createDataKey="createSimpleProduct"/>
83+
</createData>
84+
<actionGroup ref="AdminEnableDHLAPWithoutAccountAndCountryConfigurationActionGroup" stepKey="enableDHL"/>
85+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
86+
<argument name="indices" value=""/>
87+
</actionGroup>
88+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
89+
<argument name="tags" value="config full_page"/>
90+
</actionGroup>
91+
</before>
92+
<after>
93+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer" />
94+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
95+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
96+
<deleteData createDataKey="createConfigChildProduct" stepKey="deleteConfigChildProduct"/>
97+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
98+
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
99+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteSimpleProduct"/>
100+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
101+
<!-- Reset shipping origin -->
102+
<actionGroup ref="AdminResetShippingOriginConfigurationActionGroup" stepKey="resetCaliforniaShippingOrigin"/>
103+
<actionGroup ref="AdminDisableDHLConfigurationActionGroup" stepKey="resetDhlConfig"/>
104+
<!-- unselect sgd as a allowed currency -->
105+
<actionGroup ref="AdminNavigateToCurrencySetupPageActionGroup" stepKey="againGoToCurrencySetupPage"/>
106+
<!--Open currency options and select singapore dollar as allowed currency-->
107+
<conditionalClick selector="{{AdminConfigSection.currencyOptionsTab}}" dependentSelector="{{AdminConfigSection.defaultCurrencySelect}}" visible="false" stepKey="openCurrencyOptions"/>
108+
<selectOption selector="{{AdminConfigSection.allowedCurrencies}}" parameterArray="['US Dollar']" stepKey="UnselectAllowedCurrency"/>
109+
<actionGroup ref="SaveStoreConfigurationActionGroup" stepKey="saveConfiguration"/>
110+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogout"/>
111+
</after>
112+
<!--Login to storefront from customer-->
113+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginCustomer">
114+
<argument name="Customer" value="$$createCustomer$$"/>
115+
</actionGroup>
116+
<!-- Add bundle product to cart -->
117+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openBundleProductPage">
118+
<argument name="productUrl" value="$$createBundleProduct.custom_attributes[url_key]$$" />
119+
</actionGroup>
120+
<actionGroup ref="StorefrontAddBundleProductFromProductToCartActionGroup" stepKey="addBundleProductToCart">
121+
<argument name="productName" value="$createBundleProduct.name$"/>
122+
</actionGroup>
123+
<!-- Add simple product to cart -->
124+
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addProductToCart">
125+
<argument name="product" value="$$createSimpleProduct$$"/>
126+
</actionGroup>
127+
<!-- Add Configurable Product to cart -->
128+
<actionGroup ref="StorefrontAddConfigurableProductToTheCartActionGroup" stepKey="addConfigurableProductToCart">
129+
<argument name="urlKey" value="$$createConfigProduct.custom_attributes[url_key]$$" />
130+
<argument name="productAttribute" value="$$createConfigProductAttribute.default_value$$"/>
131+
<argument name="productOption" value="$$getConfigAttributeOption.value$$"/>
132+
<argument name="qty" value="1"/>
133+
</actionGroup>
134+
<!-- Go to Shopping Cart -->
135+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="goToCheckoutCartIndexPage"/>
136+
<conditionalClick selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" dependentSelector="{{CheckoutCartSummarySection.estimateShippingAndTaxSummary}}" visible="false" stepKey="openEstimateShippingAndTaxSection"/>
137+
<actionGroup ref="CheckoutFillEstimateShippingAndTaxActionGroup" stepKey="fillEstimateShippingAndTaxFields">
138+
<argument name="address" value="DE_Address_Berlin_Not_Default_Address"/>
139+
</actionGroup>
140+
<waitForElement selector="{{CheckoutCartSummarySection.shippingMethods('Express worldwide')}}" stepKey="verifyExpressWorldWideIsAvailable"/>
141+
<waitForElement selector="{{CheckoutCartSummarySection.shippingMethods('Express easy')}}" stepKey="verifyExpressEasyIsAvailable"/>
142+
<waitForElement selector="{{CheckoutCartSummarySection.shippingMethods('Express 12:00')}}" stepKey="verifyExpress12IsAvailable"/>
143+
<waitForElement selector="{{CheckoutCartSummarySection.shippingMethods('Medical express')}}" stepKey="verifyMedicalExpressIsAvailable"/>
144+
<waitForElementClickable selector="{{CheckoutCartSummarySection.shippingMethods('Express worldwide')}}" stepKey="waitForExpressWorldWideIsClickable"/>
145+
<click selector="{{CheckoutCartSummarySection.shippingMethods('Express worldwide')}}" stepKey="selectExpressWorldWide"/>
146+
<actionGroup ref="StorefrontClickProceedToCheckoutActionGroup" stepKey="goToCheckout"/>
147+
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
148+
<!-- Checkout select Check/Money Order payment -->
149+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyPayment"/>
150+
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickPlaceOrder"/>
151+
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="grabOrderNumber"/>
152+
<!--navigate to orders grid-->
153+
<actionGroup ref="AdminOrdersPageOpenActionGroup" stepKey="goToAdminSalesOrders"/>
154+
<!--filter order by ID-->
155+
<actionGroup ref="OpenOrderByIdActionGroup" stepKey="filterOrderGridById">
156+
<argument name="orderId" value="$grabOrderNumber"/>
157+
</actionGroup>
158+
<!--assert order ID-->
159+
<assertNotEmpty stepKey="assertOrderIdIsNotEmpty">
160+
<actualResult type="const">$grabOrderNumber</actualResult>
161+
</assertNotEmpty>
162+
</test>
163+
</tests>

‎app/code/Magento/Shipping/Test/Mftf/ActionGroup/AdminSetShippingOriginConfigForStateFieldActionGroup.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 2024 Adobe
5+
* All Rights Reserved.
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="AdminSetShippingOriginConfigForStateFieldActionGroup" extends="AdminSetShippingOriginConfigActionGroup">
12+
<annotations>
13+
<description>Admin Set shipping origin for custom address details on origin page.</description>
14+
</annotations>
15+
<arguments>
16+
<argument name="stateField" type="string" defaultValue="Central"/>
17+
</arguments>
18+
<remove keyForRemoval="SelectState"/>
19+
<fillField selector="{{AdminShippingSettingsConfigSection.stateField}}" userInput="{{stateField}}" stepKey="fillStateField" after="WaitForUncheckStateSystemValue"/>
20+
</actionGroup>
21+
</actionGroups>

‎app/code/Magento/Shipping/Test/Mftf/Section/AdminShippingSettingsConfigSection.xml

Lines changed: 3 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 2024 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -21,5 +21,6 @@
2121
<element name="shippingPolicyParametersOpened" type="block" selector="#shipping_shipping_policy-head.open" timeout="30"/>
2222
<element name="shippingPolicy" type="block" selector="#row_shipping_shipping_policy_shipping_policy_content"/>
2323
<element name="dropdownShippingPolicy" type="select" selector="#row_shipping_shipping_policy_enable_shipping_policy select"/>
24+
<element name="stateField" type="input" selector="input[name='groups[origin][fields][region_id][value]']"/>
2425
</section>
2526
</sections>

0 commit comments

Comments
 (0)