Skip to content

Commit 3ddefc3

Browse files
committed
Merge branch 'ACQE-7117' into functiona-tests-mainline-deployment-1
2 parents f76d3c0 + f9556e4 commit 3ddefc3

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed
Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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="AdminReorderPlacedUsingDHLAPShippingMethodTest" extends="StorefrontRegisteredCustomerUsesDHLAPOnlineShippingCarrierOnCheckoutTest">
12+
<annotations>
13+
<stories value="Admin Reorder with DHL Shipping method"/>
14+
<title value="Reorder placed order using DHL in admin panel"/>
15+
<description value="Reorder in admin panel order placed using DHL (AP) as a shipping method"/>
16+
<severity value="MAJOR"/>
17+
<testCaseId value="AC-4802"/>
18+
<group value="pr_exclude"/>
19+
<group value="3rd_party_integration"/>
20+
</annotations>
21+
<remove keyForRemoval="selectExpressWorldWide"/>
22+
<click selector="{{CheckoutCartSummarySection.shippingMethods('Express easy')}}" after="verifyMedicalExpressIsAvailable" stepKey="selectExpressEasy"/>
23+
<actionGroup ref="AdminOrderGridClickFirstRowActionGroup" stepKey="clickOrderRow"/>
24+
<actionGroup ref="AdminStartReorderFromOrderPageActionGroup" stepKey="startReorder"/>
25+
<!--select Check/Money order payment method-->
26+
<scrollTo selector="{{AdminOrderFormPaymentSection.DHLShipping('Express easy')}}" stepKey="scrollToDHLShippingMethod"/>
27+
<waitForText selector="{{AdminOrderFormPaymentSection.DHLShipping('Express easy')}}" userInput="Express easy" stepKey="verifyDHLShippingMethodIsSelected"/>
28+
<waitForText selector="{{AdminOrderFormPaymentSection.verifyCheckMoneyPayment}}" userInput="Check / Money order" stepKey="verifyCheckMoneyOrderIsSelected"/>
29+
<actionGroup ref="AdminSubmitOrderActionGroup" stepKey="submitOrder"/>
30+
<actionGroup ref="AdminOrderViewCheckStatusActionGroup" stepKey="seeAdminOrderStatusIsPending"/>
31+
<waitForText selector="{{AdminOrderFormPaymentSection.shippingMethodName('DHL - Express easy')}}" userInput="DHL - Express easy" stepKey="verifyShippingAndHandlingInformationInOrderPage"/>
32+
</test>
33+
</tests>

app/code/Magento/Sales/Test/Mftf/Section/AdminOrderFormPaymentSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,8 @@
3535
<element name="selectPaymentMethod" type="radio" selector="//div[@id='order-billing_method_form']//input[@title='Check / Money order']"/>
3636
<element name="checkMoneyOrderText" type="text" selector="//div[@id='order-billing_method_form']//dl//dt//label[contains(text(),'Check / Money order')]"/>
3737
<element name="upsOption" type="radio" selector="//label[contains(text(),'UPS Worldwide Expedited -')]//ancestor::label[@class='admin__field-label']"/>
38+
<element name="DHLShipping" type="text" selector="//dd[@class='admin__order-shipment-methods-options' and contains(text(),'{{paymentMethodName}}')]" parameterized="true"/>
39+
<element name="shippingMethodName" type="text" selector="//*[contains(text(), '{{paymentMethodName}}')]" parameterized="true"/>
40+
<element name="verifyCheckMoneyPayment" type="text" selector="//label[@for='p_method_checkmo']"/>
3841
</section>
3942
</sections>

0 commit comments

Comments
 (0)