Skip to content

Commit a8db23f

Browse files
committed
ACQE-7692: Change xml to rest for UPS shipping method
1 parent df92deb commit a8db23f

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

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

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,17 @@
1818
<conditionalClick selector="{{AdminShippingMethodUPSSection.UPSTab}}" dependentSelector="{{AdminShippingMethodUPSSection.handlingFee}}" visible="false" stepKey="openUPSTab"/>
1919
<uncheckOption selector="{{AdminShippingMethodUPSSection.enableCheckoutCheckbox}}" stepKey="unCheckEnableForCheckout"/>
2020
<selectOption selector="{{AdminShippingMethodUPSSection.enableCheckoutSelect}}" userInput="{{shipping.enableCheckoutSelect}}" stepKey="selectEnableForCheckoutToYes"/>
21-
<fillField selector="{{AdminShippingMethodUPSSection.accessLicenseNumber}}" userInput="{{_CREDS.magento/carriers_ups_access_license_number}}" stepKey="enterAccessLicenseNumber"/>
22-
<fillField selector="{{AdminShippingMethodUPSSection.password}}" userInput="{{_CREDS.magento/carriers_ups_password}}" stepKey="enterPassword"/>
23-
<fillField selector="{{AdminShippingMethodUPSSection.username}}" userInput="{{_CREDS.magento/carriers_ups_username}}" stepKey="enterUsername"/>
21+
<uncheckOption selector="{{AdminShippingMethodUPSSection.carriersUPSTypeSystem}}" stepKey="unCheckTypeSystem"/>
22+
<selectOption selector="{{AdminShippingMethodUPSSection.carriersUpsType}}" userInput="UPS_REST" stepKey="selectRestOption"/>
23+
<uncheckOption selector="{{AdminShippingMethodUPSSection.carriersUpsGatewayRestUrlSystem}}" stepKey="unCheckGatewayRestUrlSystem"/>
24+
<fillField selector="{{AdminShippingMethodUPSSection.carriersUpsGatewayRestUrl}}" userInput="{{_CREDS.magento/carriers_ups_gateway_rest_url}}" stepKey="enterGateWayRestURl"/>
25+
<uncheckOption selector="{{AdminShippingMethodUPSSection.carriersUpsTrackingRestUrlSystem}}" stepKey="unCheckTrackingRestUrlSystem"/>
26+
<fillField selector="{{AdminShippingMethodUPSSection.carriersUpsTrackingRestUrl}}" userInput="{{_CREDS.magento/carriers_ups_tracking_rest_url}}" stepKey="enterTrackingRestURl"/>
27+
<fillField selector="{{AdminShippingMethodUPSSection.password}}" userInput="{{_CREDS.magento/carriers_ups_rest_password}}" stepKey="enterPassword"/>
28+
<fillField selector="{{AdminShippingMethodUPSSection.username}}" userInput="{{_CREDS.magento/carriers_ups_rest_username}}" stepKey="enterUsername"/>
2429
<uncheckOption selector="{{AdminShippingMethodUPSSection.modeCheckbox}}" stepKey="unCheckMode"/>
2530
<selectOption selector="{{AdminShippingMethodUPSSection.modeSelect}}" userInput="{{shipping.modeSelect}}" stepKey="selectModeToDevelopment"/>
26-
<fillField selector="{{AdminShippingMethodUPSSection.shipperNumberInput}}" userInput="{{_CREDS.magento/carriers_ups_shipper_number}}" stepKey="enterShipperNumber"/>
31+
<fillField selector="{{AdminShippingMethodUPSSection.shipperNumberInput}}" userInput="{{_CREDS.magento/carriers_ups_rest_shipper_number}}" stepKey="enterShipperNumber"/>
2732
<selectOption selector="{{AdminShippingMethodUPSSection.showMethodIfNotApplicableSelect}}" userInput="{{shipping.showMethodIfNotApplicableSelect}}" stepKey="selectShowMethodIfNotApplicableToYes"/>
2833
<selectOption selector="{{AdminShippingMethodUPSSection.debugSelect}}" userInput="{{shipping.debugSelect}}" stepKey="selectDebugToYes"/>
2934
<click selector="{{AdminConfigSection.saveButton}}" stepKey="saveConfig"/>

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
1111
<section name="AdminShippingMethodUPSSection">
12+
<element name="carriersUPSTypeSystem" type="checkbox" selector="//*[@id='carriers_ups_type_inherit']"/>
13+
<element name="carriersUpsType" type="select" selector="//*[@id='carriers_ups_type']"/>
14+
<element name="carriersUpsGatewayRestUrlSystem" type="checkbox" selector="//*[@id='carriers_ups_gateway_rest_url_inherit']"/>
15+
<element name="carriersUpsGatewayRestUrl" type="input" selector="//*[@id='carriers_ups_gateway_rest_url']"/>
16+
<element name="carriersUpsTrackingRestUrlSystem" type="checkbox" selector="//*[@id='carriers_ups_tracking_rest_url_inherit']"/>
17+
<element name="carriersUpsTrackingRestUrl" type="input" selector="//*[@id='carriers_ups_tracking_rest_url']"/>
1218
<element name="UPSTab" type="button" selector="//div[@class='section-config']//div[@class='entry-edit-head admin__collapsible-block']//a[@id='carriers_ups-head']"/>
1319
<element name="enableCheckoutCheckbox" type="checkbox" selector="//tr[@id='row_carriers_ups_active']//td//input[@id='carriers_ups_active_inherit']"/>
1420
<element name="enableCheckoutSelect" type="select" selector="//tr[@id='row_carriers_ups_active']//td//select[@id='carriers_ups_active']"/>

0 commit comments

Comments
 (0)