Skip to content

Commit 52a6aae

Browse files
nikhilsharma-adobenikhilsharma-adobe
committed
Merge branch 'ACQE-6513' into ACQE-6777_mainline_deployment
2 parents 46e671f + 59d7498 commit 52a6aae

File tree

4 files changed

+131
-0
lines changed

4 files changed

+131
-0
lines changed

‎app/code/Magento/Multishipping/Test/Mftf/ActionGroup/StorefrontUpdateMultishippingItemsQuantityAndAddressesActionGroup.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
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="StorefrontUpdateMultishippingItemsQuantityAndAddressesActionGroup">
12+
<annotations>
13+
<description>Update multishipping item's quantity and addresses on Ship to Multiple Addresses page.</description>
14+
</annotations>
15+
<waitForElementClickable selector="{{MultishippingSection.updateQtyAndAddress}}" stepKey="waitForUpdateQtyAndAddressButton"/>
16+
<click selector="{{MultishippingSection.updateQtyAndAddress}}" stepKey="clickOnUpdateQtyAndAddressButton"/>
17+
</actionGroup>
18+
</actionGroups>

‎app/code/Magento/Multishipping/Test/Mftf/Data/MultishippingConfigData.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
<data key="path">multishipping/options/checkout_multiple_maximum_qty</data>
1313
<data key="value">2</data>
1414
</entity>
15+
<entity name="MaximumQtyAllowed10ForShippingToMultipleAddressesConfigData">
16+
<data key="path">multishipping/options/checkout_multiple_maximum_qty</data>
17+
<data key="value">10</data>
18+
</entity>
1519
<!-- Magento Default Value -->
1620
<entity name="MaximumQtyAllowed100ForShippingToMultipleAddressesConfigData">
1721
<data key="path">multishipping/options/checkout_multiple_maximum_qty</data>

‎app/code/Magento/Multishipping/Test/Mftf/Section/MultishippingSection/MultishippingSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
<element name="addressSection" type="text" selector="//div[@class='block-title']/strong[text()='Address {{var}} ']" parameterized="true"/>
2222
<element name="flatRateCharge" type="text" selector="//span[@class='price' and text()='${{price}}']/../../label[contains(text(),'Fixed')]" parameterized="true"/>
2323
<element name="enterNewAddress" type="button" selector=".action.add"/>
24+
<element name="updateQtyAndAddress" type="button" selector="//button[@type='submit' and @class='action update']"/>
25+
<element name="attentionMessage" type="text" selector="//div[@class='modal-inner-wrap']//div[contains(text(),'Maximum qty allowed for Shipping to multiple addresses is 10')]"/>
26+
<element name="acceptAttention" type="button" selector="//button[@class='action-primary action-accept']//span[contains(text(),'OK')]"/>
2427
</section>
2528
</sections>

‎app/code/Magento/Multishipping/Test/Mftf/Test/AdminSetQuantityLimitationForProductsBoughtUsingMultishippingTest.xml

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
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="AdminSetQuantityLimitationForProductsBoughtUsingMultishippingTest">
12+
<annotations>
13+
<features value="Shipping"/>
14+
<stories value="Multishipping limited quantity of products"/>
15+
<title value="Admin can set quantity limitation for products that can be bought using Multishipping"/>
16+
<description value="Verification for Maximum Qty Allowed for Shipping to Multiple Addresses configuration setting"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="AC-4309"/>
19+
</annotations>
20+
<before>
21+
<!--Login as admin-->
22+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
23+
<!--Create simple product with quantity > 15-->
24+
<createData entity="SimpleProduct" stepKey="createProduct">
25+
<field key="quantity">16</field>
26+
</createData>
27+
<!--Enable Flat Rate shipping method-->
28+
<magentoCLI command="config:set {{EnableFlatRateConfigData.path}} {{EnableFlatRateConfigData.value}}" stepKey="enableFlatRate"/>
29+
<!--Create customer-->
30+
<createData entity="Simple_US_CA_Customer" stepKey="createCustomer"/>
31+
<!--Set maximum quantity allowed for shipping to multiple addresses as 10-->
32+
<magentoCLI command="config:set {{MaximumQtyAllowed10ForShippingToMultipleAddressesConfigData.path}} {{MaximumQtyAllowed10ForShippingToMultipleAddressesConfigData.value}}" stepKey="setMaximumQuantityAllowedForShippingTo10"/>
33+
<!--Flush cache-->
34+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
35+
<argument name="tags" value="config full_page"/>
36+
</actionGroup>
37+
</before>
38+
<after>
39+
<!--Set maximum quantity allowed for shipping to multiple addresses as default-->
40+
<magentoCLI command="config:set {{MaximumQtyAllowed100ForShippingToMultipleAddressesConfigData.path}} {{MaximumQtyAllowed100ForShippingToMultipleAddressesConfigData.value}}" stepKey="setMaximumQuantityAllowedForShippingToDefault"/>
41+
<!--Delete product-->
42+
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
43+
<!--Delete customer-->
44+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
45+
<!--Logout from admin-->
46+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
47+
</after>
48+
<!--Login as customer from storefront-->
49+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="storefrontCustomerLogin">
50+
<argument name="Customer" value="$$createCustomer$$"/>
51+
</actionGroup>
52+
<!--Open product page-->
53+
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPage">
54+
<argument name="product" value="$$createProduct$$"/>
55+
</actionGroup>
56+
<!--Add product to cart-->
57+
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
58+
<argument name="product" value="$$createProduct$$"/>
59+
<argument name="productCount" value="1"/>
60+
</actionGroup>
61+
<!--Open cart page-->
62+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openCartPage"/>
63+
<!--Update product quantity to 11 (10>MaximumQtyAllowedForShippingToMultipleAddresses)-->
64+
<actionGroup ref="StorefrontUpdateProductQTYOnShoppingCartPageActionGroup" stepKey="updateMaximumQtyAllowedForShippingTo11">
65+
<argument name="product" value="$createProduct.name$"/>
66+
<argument name="qty" value="11"/>
67+
</actionGroup>
68+
<!--"Check Out with Multiple Addresses" link is not present-->
69+
<actionGroup ref="AssertStorefrontMultiShippingOptionIsNotPresentOnShoppingCartPageActionGroup" stepKey="MultipleAddressCheckoutIsNotPresent"/>
70+
<!--Update product quantity to 10 (10=MaximumQtyAllowedForShippingToMultipleAddresses)-->
71+
<actionGroup ref="StorefrontUpdateProductQTYOnShoppingCartPageActionGroup" stepKey="updateMaximumQtyAllowedForShippingTo10">
72+
<argument name="product" value="$createProduct.name$"/>
73+
<argument name="qty" value="10"/>
74+
</actionGroup>
75+
<!--"Check Out with Multiple Addresses" link is present-->
76+
<actionGroup ref="AssertStorefrontMultiShippingOptionIsPresentOnShoppingCartPageActionGroup" stepKey="assertMultiCheckoutAvailable"/>
77+
<!--Checkout with multiple addresses-->
78+
<actionGroup ref="StorefrontGoCheckoutWithMultipleAddressesActionGroup" stepKey="goCheckoutWithMultipleAddresses"/>
79+
<!--Assert "Ship to Multiple Addresses" page is open-->
80+
<seeInCurrentUrl url="{{MultishippingCheckoutAddressesPage.url}}" stepKey="seeShiptoMultipleAddressesPageIsOpened"/>
81+
<!--Assert product name & quantity on record 10-->
82+
<actionGroup ref="AssertStorefrontMultishippingAddressAndItemActionGroup" stepKey="assertProductOn10thRecord">
83+
<argument name="sequenceNumber" value="10"/>
84+
<argument name="productName" value="$createProduct.name$"/>
85+
<argument name="quantity" value="1"/>
86+
</actionGroup>
87+
<!--Change any product quantity to 2-->
88+
<actionGroup ref="StorefrontChangeMultishippingItemQtyActionGroup" stepKey="changeProductQuantityOn10thRecord">
89+
<argument name="sequenceNumber" value="10"/>
90+
<argument name="quantity" value="2"/>
91+
</actionGroup>
92+
<!--Click on "Update Qty & Addresses"-->
93+
<actionGroup ref="StorefrontUpdateMultishippingItemsQuantityAndAddressesActionGroup" stepKey="clickOnUpdateQtyAndAddress"/>
94+
<!--Assert error message-->
95+
<waitForText selector="{{MultishippingSection.attentionMessage}}" userInput="Maximum qty allowed for Shipping to multiple addresses is 10" stepKey="assertErrorMessage"/>
96+
<!--Accept alert-->
97+
<waitForElementClickable selector="{{MultishippingSection.acceptAttention}}" stepKey="waitToAcceptAttention"/>
98+
<click selector="{{MultishippingSection.acceptAttention}}" stepKey="acceptAttention"/>
99+
<!--Assert product quantity is NOT changed-->
100+
<actionGroup ref="AssertStorefrontMultishippingAddressAndItemActionGroup" stepKey="againAssertProductQuantityOn10thRecord">
101+
<argument name="sequenceNumber" value="10"/>
102+
<argument name="productName" value="$createProduct.name$"/>
103+
<argument name="quantity" value="1"/>
104+
</actionGroup>
105+
</test>
106+
</tests>

0 commit comments

Comments
 (0)