Skip to content

Commit 86c24cd

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
ACQE-5761: review change and file rename
1 parent 6fc7b08 commit 86c24cd

File tree

6 files changed

+18
-55
lines changed

6 files changed

+18
-55
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontShippingPageRedirectActionGroup.xml

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

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTest/StoreFrontValidateDynamicChangeOfShippingRateForGuestUserTest.xml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,13 @@
2929
<!-- Go to Store > Configuration > Sales > Shipping Methods -->
3030
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
3131
<!-- Free Shipping Configuration -->
32-
<actionGroup ref="AdminFreeShippingActionGroup" stepKey="freeShippingConfig">
33-
<argument name="enabled" value="Yes"/>
32+
<actionGroup ref="AdminEnableFreeShippingActionGroup" stepKey="freeShippingConfig">
3433
<argument name="allowSpecificCountry" value="Specific Countries"/>
3534
<argument name="specificCountry" value="Afghanistan"/>
3635
</actionGroup>
3736
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfiguration"/>
3837
<!-- DHL Shipping Configuration -->
39-
<actionGroup ref="AdminDHLConfigurationActionGroup" stepKey="dhlConfig">
40-
<argument name="enabled" value="Yes"/>
38+
<actionGroup ref="AdminEnableDHLConfigurationActionGroup" stepKey="dhlConfig">
4139
<argument name="config" value="dhlConfigData"/>
4240
<argument name="allowSpecificCountry" value="Specific Countries"/>
4341
<argument name="specificCountry" value="United Kingdom"/>
@@ -66,7 +64,7 @@
6664
<actionGroup ref="AddSimpleProductToCartActionGroup" stepKey="addSimpleProductToCart">
6765
<argument name="product" value="$createSimpleProduct$"/>
6866
</actionGroup>
69-
<actionGroup ref="StorefrontShippingPageRedirectActionGroup" stepKey="goToShippingPage"/>
67+
<actionGroup ref="OpenStoreFrontCheckoutShippingPageActionGroup" stepKey="goToShippingPage"/>
7068
<!-- Guest checkout -->
7169
<actionGroup ref="FillGuestCheckoutShippingAddressFormActionGroup" stepKey="goToShippingAndFillDetails">
7270
<argument name="customerAddress" value="US_CA_Address"/>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminDisableDHLConfigurationActionGroup.xml

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,16 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminDisableDHLConfigurationActionGroup">
12-
<arguments>
13-
<argument name="enabled" type="string" defaultValue="No"/>
14-
<argument name="config" defaultValue="dhlConfigData"/>
15-
<argument name="allowSpecificCountry" type="string" defaultValue="Specific Countries"/>
16-
<argument name="showMethod" type="string" defaultValue="No"/>
17-
<argument name="debug" type="string" defaultValue="No"/>
18-
<argument name="sandbox" type="string" defaultValue="No"/>
19-
</arguments>
2012
<conditionalClick selector="{{AdminShippingMethodDHLSection.carriersDHLTab}}" dependentSelector="{{AdminShippingMethodDHLSection.carriersDHLTabOpen}}" visible="false" stepKey="toggleClick"/>
2113
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" stepKey="waitForCarriersDHLActiveCheckbox"/>
22-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" userInput="{{enabled}}" stepKey="selectOptionForDHLEnabled"/>
14+
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" userInput="No" stepKey="selectOptionForDHLEnabled"/>
2315
<checkOption selector="{{AdminShippingMethodDHLSection.carriersDHLActive}}" stepKey="clickOnFreeShippingCheckbox"/>
24-
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLAccessId}}" stepKey="waitForDHLAccessID"/>
25-
<fillField selector="{{AdminShippingMethodDHLSection.carriersDHLAccessId}}" userInput="{{config.access_id}}" stepKey="fillDHLAccessID"/>
26-
<fillField selector="{{AdminShippingMethodDHLSection.carriersDHLPassword}}" userInput="{{config.password}}" stepKey="fillDHLPassword"/>
27-
<fillField selector="{{AdminShippingMethodDHLSection.carriersDHLAccountField}}" userInput="{{config.account_number}}" stepKey="fillDHLAccountNumber"/>
2816
<checkOption selector="{{AdminShippingMethodDHLSection.carriersDHLAccount}}" stepKey="clickOnDHLAccount"/>
2917
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLSelectAllowSpecific}}" stepKey="waitForDHLAllowSpecific"/>
30-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectAllowSpecific}}" userInput="{{allowSpecificCountry}}" stepKey="selectOptionForAllowSpecificCountry"/>
31-
<uncheckOption selector="{{AdminShippingMethodDHLSection.carriersDHLAllowSpecific}}" stepKey="clickOnDHLAllowSpecific"/>
32-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLShowMethod}}" userInput="{{showMethod}}" stepKey="selectOptionForShowMethod"/>
33-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLDebug}}" userInput="{{debug}}" stepKey="selectOptionForDebug"/>
34-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSandbox}}" userInput="{{sandbox}}" stepKey="selectOptionForSandbox"/>
18+
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectAllowSpecific}}" userInput="All Allowed Countries" stepKey="selectOptionForAllowSpecificCountry"/>
19+
<checkOption selector="{{AdminShippingMethodDHLSection.carriersDHLAllowSpecific}}" stepKey="clickOnDHLAllowSpecific"/>
20+
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLShowMethod}}" userInput="No" stepKey="selectOptionForShowMethod"/>
21+
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLDebug}}" userInput="No" stepKey="selectOptionForDebug"/>
22+
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSandbox}}" userInput="No" stepKey="selectOptionForSandbox"/>
3523
</actionGroup>
3624
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminDisableFreeShippingActionGroup.xml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,12 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminDisableFreeShippingActionGroup">
12-
<arguments>
13-
<argument name="enabled" type="string" defaultValue="No"/>
14-
<argument name="allowSpecificCountry" type="string" defaultValue="All Allowed Countries"/>
15-
</arguments>
16-
<conditionalClick selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHead}}" dependentSelector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHeadOpen}}" visible="false" stepKey="click1"/>
12+
<conditionalClick selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHead}}" dependentSelector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHeadOpen}}" visible="false" stepKey="openFreeShippingSection"/>
1713
<waitForElementVisible selector="{{AdminShippingMethodFreeShippingSection.carriersSelectFreeShippingActive}}" stepKey="waitForFreeShippingDefaultCheckbox"/>
18-
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersSelectFreeShippingActive}}" userInput="{{enabled}}" stepKey="selectOptionForFreeShipping"/>
14+
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersSelectFreeShippingActive}}" userInput="No" stepKey="selectOptionForFreeShipping"/>
1915
<checkOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingActive}}" stepKey="clickOnFreeShippingCheckbox"/>
2016
<waitForElementVisible selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSelectAllowSpecific}}" stepKey="waitForShipApplicableDefaultCheckbox"/>
21-
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSelectAllowSpecific}}" userInput="{{allowSpecificCountry}}" stepKey="selectOptionForAllowSpecificCountries"/>
17+
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSelectAllowSpecific}}" userInput="All Allowed Countries" stepKey="selectOptionForAllowSpecificCountries"/>
2218
<checkOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingAllowSpecific}}" stepKey="clickOnShipApplicaleCountries"/>
2319
</actionGroup>
2420
</actionGroups>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminDHLConfigurationActionGroup.xml renamed to ‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableDHLConfigurationActionGroup.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,19 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminDHLConfigurationActionGroup">
11+
<actionGroup name="AdminEnableDHLConfigurationActionGroup">
1212
<arguments>
13-
<argument name="enabled" type="string" defaultValue="No"/>
1413
<argument name="config" defaultValue="dhlConfigData"/>
1514
<argument name="allowSpecificCountry" type="string" defaultValue="Specific Countries"/>
1615
<argument name="specificCountry" type="string" defaultValue="United Kingdom"/>
1716
<argument name="showMethod" type="string" defaultValue="No"/>
1817
<argument name="debug" type="string" defaultValue="No"/>
1918
<argument name="sandbox" type="string" defaultValue="No"/>
2019
</arguments>
21-
<conditionalClick selector="{{AdminShippingMethodDHLSection.carriersDHLTab}}" dependentSelector="{{AdminShippingMethodDHLSection.carriersDHLTabOpen}}" visible="false" stepKey="toggleClick"/>
20+
<conditionalClick selector="{{AdminShippingMethodDHLSection.carriersDHLTab}}" dependentSelector="{{AdminShippingMethodDHLSection.carriersDHLTabOpen}}" visible="false" stepKey="openDHLSection"/>
2221
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLActive}}" stepKey="waitForCarriersDHLActiveCheckbox"/>
2322
<uncheckOption selector="{{AdminShippingMethodDHLSection.carriersDHLActive}}" stepKey="clickOnFreeShippingCheckbox"/>
24-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" userInput="{{enabled}}" stepKey="selectOptionForDHLEnabled"/>
23+
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" userInput="Yes" stepKey="selectOptionForDHLEnabled"/>
2524
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLAccessId}}" stepKey="waitForDHLAccessID"/>
2625
<fillField selector="{{AdminShippingMethodDHLSection.carriersDHLAccessId}}" userInput="{{config.access_id}}" stepKey="fillDHLAccessID"/>
2726
<fillField selector="{{AdminShippingMethodDHLSection.carriersDHLPassword}}" userInput="{{config.password}}" stepKey="fillDHLPassword"/>

‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminFreeShippingActionGroup.xml renamed to ‎app/code/Magento/Config/Test/Mftf/ActionGroup/AdminEnableFreeShippingActionGroup.xml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminFreeShippingActionGroup">
11+
<actionGroup name="AdminEnableFreeShippingActionGroup">
1212
<arguments>
13-
<argument name="enabled" type="string" defaultValue="No"/>
1413
<argument name="allowSpecificCountry" type="string" defaultValue="All Allowed Countries"/>
1514
<argument name="specificCountry" type="string" defaultValue="Afghanistan"/>
1615
</arguments>
17-
<conditionalClick selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHead}}" dependentSelector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHeadOpen}}" visible="false" stepKey="click1"/>
16+
<conditionalClick selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHead}}" dependentSelector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSectionHeadOpen}}" visible="false" stepKey="openFreeShippingSection"/>
1817
<waitForElementVisible selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingActive}}" stepKey="waitForFreeShippingDefaultCheckbox"/>
1918
<uncheckOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingActive}}" stepKey="clickOnFreeShippingCheckbox"/>
20-
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersSelectFreeShippingActive}}" userInput="{{enabled}}" stepKey="selectOptionForFreeShipping"/>
19+
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersSelectFreeShippingActive}}" userInput="Yes" stepKey="selectOptionForFreeShipping"/>
2120
<waitForElementVisible selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingAllowSpecific}}" stepKey="waitForShipApplicableDefaultCheckbox"/>
2221
<uncheckOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingAllowSpecific}}" stepKey="clickOnShipApplicaleCountries"/>
2322
<selectOption selector="{{AdminShippingMethodFreeShippingSection.carriersFreeShippingSelectAllowSpecific}}" userInput="{{allowSpecificCountry}}" stepKey="selectOptionForAllowSpecificCountries"/>

0 commit comments

Comments
 (0)