Skip to content

Commit 6953c7d

Browse files
akaashakaash
akaash
authored and
akaash
committed
Merge branch 'ACQE-5761' into functional-mainline-ce
2 parents c164be9 + 1100274 commit 6953c7d

10 files changed

+106
-149
lines changed

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/CheckForFlatRateShippingMethodAvailabilityActionGroup.xml‎ renamed to ‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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="CheckForFlatRateShippingMethodAvailabilityActionGroup">
11+
<actionGroup name="StorefrontCheckForFlatRateShippingMethodAvailabilityActionGroup">
1212
<annotations>
1313
<description>Validates that the Shipping method is visible in the checkout page or not.</description>
1414
</annotations>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/VerifyDHLShippingMethodIsVisibilityActionGroup.xml‎ renamed to ‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontVerifyDHLShippingMethodIsVisibilityActionGroup.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
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="VerifyDHLShippingMethodIsVisibilityActionGroup">
11+
<actionGroup name="StorefrontVerifyDHLShippingMethodIsVisibilityActionGroup">
1212
<annotations>
1313
<description>Validates that the DHL Shipping method is visible in the checkout page.</description>
1414
</annotations>

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

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

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

Lines changed: 10 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111
<annotations>
1212
<features value="Checkout"/>
1313
<stories value="Shipping rate in Guest Checkout"/>
14-
<title value="Guest Checkout - guest should be able to see the change in the shipping rate on fly."/>
14+
<title value="Available shipping rate is changed on fly according to inputed data"/>
1515
<description value="Should be able to change the shipping rate while changing the input data based on the specific country and zipcode."/>
1616
<severity value="CRITICAL"/>
1717
<testCaseId value="AC-6139"/>
18+
<group value="pr_exclude"/>
19+
<group value="3rd_party_integration"/>
1820
</annotations>
1921
<before>
2022
<actionGroup ref="AdminLoginActionGroup" stepKey="LoginAsAdmin"/>
21-
<!-- Enabling Flat Rate -->
22-
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
2323
<!-- Creating subcategory -->
2424
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2525
<!-- Creating Simple Product -->
@@ -29,26 +29,16 @@
2929
<!-- Go to Store > Configuration > Sales > Shipping Methods -->
3030
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="openShippingMethodConfigPage"/>
3131
<!-- Free Shipping Configuration -->
32-
<actionGroup ref="AdminEnableFreeShippingActionGroup" stepKey="freeShippingConfig">
33-
<argument name="allowSpecificCountry" value="Specific Countries"/>
34-
<argument name="specificCountry" value="Afghanistan"/>
35-
</actionGroup>
36-
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfiguration"/>
32+
<magentoCLI command="config:set {{EnableFreeShippingConfigData.path}} {{EnableFreeShippingConfigData.value}}" stepKey="enableFreeShipping"/>
33+
<magentoCLI command="config:set {{EnableFreeShippingToSpecificCountriesConfigData.path}} {{EnableFreeShippingToSpecificCountriesConfigData.value}}" stepKey="selectSpecificCountries"/>
34+
<magentoCLI command="config:set {{EnableFreeShippingToAfghanistanConfigData.path}} {{EnableFreeShippingToAfghanistanConfigData.value}}" stepKey="selectCountry"/>
3735
<!-- DHL Shipping Configuration -->
38-
<actionGroup ref="AdminEnableDHLConfigurationActionGroup" stepKey="dhlConfig">
39-
<argument name="config" value="dhlConfigData"/>
40-
<argument name="allowSpecificCountry" value="Specific Countries"/>
41-
<argument name="specificCountry" value="United Kingdom"/>
42-
<argument name="showMethod" value="Yes"/>
43-
<argument name="debug" value="Yes"/>
44-
<argument name="sandbox" value="Yes"/>
45-
</actionGroup>
46-
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="saveConfigurationForDHL"/>
36+
<actionGroup ref="AdminEnableDHLConfigurationActionGroup" stepKey="dhlConfig"/>
4737
<!--Set Shipping settings origin data-->
4838
<actionGroup ref="AdminSetShippingOriginConfigActionGroup" stepKey="setShippingOriginConfigurationData">
4939
<argument name="country" value="United States"/>
5040
<argument name="state" value="California"/>
51-
<argument name="postcode" value="90034"/>
41+
<argument name="postcode" value="90230"/>
5242
</actionGroup>
5343
<actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCachePostChangingConfigurationSettings">
5444
<argument name="tags" value="config"/>
@@ -96,14 +86,12 @@
9686
<after>
9787
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
9888
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
99-
<!-- Disable flat rate method -->
100-
<magentoCLI command="config:set {{DisableFlatRateConfigData.path}} {{DisableFlatRateConfigData.value}}" stepKey="disableFlatRate"/>
10189
<!-- Reset shipping origin -->
10290
<actionGroup ref="AdminResetShippingOriginConfigurationActionGroup" stepKey="ResetCaliforniaShippingOrigin"/>
10391
<actionGroup ref="AdminOpenShippingMethodsConfigPageActionGroup" stepKey="shippingMethodConfigPage"/>
10492
<!-- Reset free shipping origin -->
105-
<actionGroup ref="AdminDisableFreeShippingActionGroup" stepKey="resetFreeShippingConfig"/>
106-
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="resetSaveConfiguration"/>
93+
<magentoCLI command="config:set {{DisableFreeShippingConfigData.path}} {{DisableFreeShippingConfigData.value}}" stepKey="disableFreeShipping"/>
94+
<magentoCLI command="config:set {{EnableFreeShippingToAllAllowedCountriesConfigData.path}} {{EnableFreeShippingToAllAllowedCountriesConfigData.value}}" stepKey="selectAllCountries"/>
10795
<!-- Reset dhl configuration origin -->
10896
<actionGroup ref="AdminDisableDHLConfigurationActionGroup" stepKey="resetDhlConfig"/>
10997
<actionGroup ref="AdminSaveConfigActionGroup" stepKey="resetSaveConfigurationForDHL"/>

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,10 @@
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-
<conditionalClick selector="{{AdminShippingMethodDHLSection.carriersDHLTab}}" dependentSelector="{{AdminShippingMethodDHLSection.carriersDHLTabOpen}}" visible="false" stepKey="openDHLSection"/>
13-
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" stepKey="waitForCarriersDHLActiveCheckbox"/>
14-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" userInput="No" stepKey="selectOptionForDHLEnabled"/>
15-
<checkOption selector="{{AdminShippingMethodDHLSection.carriersDHLActive}}" stepKey="clickOnFreeShippingCheckbox"/>
16-
<checkOption selector="{{AdminShippingMethodDHLSection.carriersDHLAccount}}" stepKey="clickOnDHLAccount"/>
17-
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLSelectAllowSpecific}}" stepKey="waitForDHLAllowSpecific"/>
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"/>
12+
<magentoCLI command="config:set {{AdminDHLDisableConfigData.path}} {{AdminDHLDisableConfigData.value}}" stepKey="disableDHL"/>
13+
<magentoCLI command="config:set {{AdminCarriersDHLAllowedAllCountries.path}} {{AdminCarriersDHLAllowedAllCountries.value}}" stepKey="DHLAllowedAllCountries"/>
14+
<magentoCLI command="config:set {{AdminDisableDHLShowMethod.path}} {{AdminDisableDHLShowMethod.value}}" stepKey="disableDHLShowMethod"/>
15+
<magentoCLI command="config:set {{AdminDisableDHLDebug.path}} {{AdminDisableDHLDebug.value}}" stepKey="disableDHLDebug"/>
16+
<magentoCLI command="config:set {{AdminDisableSandboxMode.path}} {{AdminDisableSandboxMode.value}}" stepKey="disableSandboxMode"/>
2317
</actionGroup>
2418
</actionGroups>

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

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

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

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,14 @@
99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
1111
<actionGroup name="AdminEnableDHLConfigurationActionGroup">
12-
<arguments>
13-
<argument name="config" defaultValue="dhlConfigData"/>
14-
<argument name="allowSpecificCountry" type="string" defaultValue="Specific Countries"/>
15-
<argument name="specificCountry" type="string" defaultValue="United Kingdom"/>
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>
20-
<conditionalClick selector="{{AdminShippingMethodDHLSection.carriersDHLTab}}" dependentSelector="{{AdminShippingMethodDHLSection.carriersDHLTabOpen}}" visible="false" stepKey="openDHLSection"/>
21-
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLActive}}" stepKey="waitForCarriersDHLActiveCheckbox"/>
22-
<uncheckOption selector="{{AdminShippingMethodDHLSection.carriersDHLActive}}" stepKey="clickOnFreeShippingCheckbox"/>
23-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectBox}}" userInput="Yes" stepKey="selectOptionForDHLEnabled"/>
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-
<uncheckOption selector="{{AdminShippingMethodDHLSection.carriersDHLAccount}}" stepKey="clickOnDHLAccount"/>
28-
<fillField selector="{{AdminShippingMethodDHLSection.carriersDHLAccountField}}" userInput="{{config.account_number}}" stepKey="fillDHLAccountNumber"/>
29-
<waitForElementVisible selector="{{AdminShippingMethodDHLSection.carriersDHLAllowSpecific}}" stepKey="waitForDHLAllowSpecific"/>
30-
<uncheckOption selector="{{AdminShippingMethodDHLSection.carriersDHLAllowSpecific}}" stepKey="clickOnDHLAllowSpecific"/>
31-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSelectAllowSpecific}}" userInput="{{allowSpecificCountry}}" stepKey="selectOptionForAllowSpecificCountry"/>
32-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSpecificCountry}}" userInput="{{specificCountry}}" stepKey="selectOptionForSpecificCountries"/>
33-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLShowMethod}}" userInput="{{showMethod}}" stepKey="selectOptionForShowMethod"/>
34-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLDebug}}" userInput="{{debug}}" stepKey="selectOptionForDebug"/>
35-
<selectOption selector="{{AdminShippingMethodDHLSection.carriersDHLSandbox}}" userInput="{{sandbox}}" stepKey="selectOptionForSandbox"/>
12+
<magentoCLI command="config:set {{AdminDHLEnableConfigData.path}} {{AdminDHLEnableConfigData.value}}" stepKey="enableDHL"/>
13+
<magentoCLI command="config:set {{AdminCarriersDHLId.path}} {{AdminCarriersDHLId.value}}" stepKey="CarrierDHLID"/>
14+
<magentoCLI command="config:set {{AdminCarriersDHLPassword.path}} {{AdminCarriersDHLPassword.value}}" stepKey="DHLPassword"/>
15+
<magentoCLI command="config:set {{AdminCarriersDHLAccount.path}} {{AdminCarriersDHLAccount.value}}" stepKey="DHLAccount"/>
16+
<magentoCLI command="config:set {{AdminCarriersDHLSpecificCountries.path}} {{AdminCarriersDHLSpecificCountries.value}}" stepKey="DHLSpecificCountries"/>
17+
<magentoCLI command="config:set {{DHLSpecificCountryUnitedKingdomConfigData.path}} {{DHLSpecificCountryUnitedKingdomConfigData.value}}" stepKey="DHLSelectSpecificCountry"/>
18+
<magentoCLI command="config:set {{AdminEnableDHLShowMethod.path}} {{AdminEnableDHLShowMethod.value}}" stepKey="enableDHLShowMethod"/>
19+
<magentoCLI command="config:set {{AdminEnableDHLDebug.path}} {{AdminEnableDHLDebug.value}}" stepKey="enableDHLDebug"/>
20+
<magentoCLI command="config:set {{AdminEnableSandboxMode.path}} {{AdminEnableSandboxMode.value}}" stepKey="enableSandboxMode"/>
3621
</actionGroup>
3722
</actionGroups>

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

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

0 commit comments

Comments
 (0)