Skip to content

Commit fddc22d

Browse files
Manjusha.SManjusha.S
Manjusha.S
authored and
Manjusha.S
committed
Merge branch 'develop' of https://github.com/magento-gl/inventory into ACQE-4014_1
2 parents 05f3843 + 4c1ed5e commit fddc22d

File tree

49 files changed

+1631
-795
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+1631
-795
lines changed

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminChangeDefaultQuantityOnProductEditPageActionGroup.xml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
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+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
9+
<actionGroup name="AdminChangeDefaultQuantityOnProductEditPageActionGroup">
10+
<annotations>
11+
<description>Admin change the default quantity on product page</description>
12+
</annotations>
13+
14+
<scrollTo selector="{{AdminProductGridSection.btnAdvancedInventory}}" x="-200" y="-200" stepKey="scrollToAdvancedInventory"/>
15+
<click selector="{{AdminProductGridSection.btnAdvancedInventory}}" stepKey="clickOnAdvancedInventory"/>
16+
<waitForPageLoad time="30" stepKey="waitForPageLoad"/>
17+
<conditionalClick selector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" dependentSelector="{{AdminProductFormAdvancedInventorySection.useConfigSettings}}" visible="true" stepKey="checkUseConfigSettingsCheckBox"/>
18+
<selectOption selector="{{AdminProductFormAdvancedInventorySection.manageStock}}" userInput="Yes" stepKey="selectManageStock"/>
19+
<click stepKey="clickOnDoneButton" selector="{{AdminProductFormAdvancedInventorySection.doneButton}}"/>
20+
<waitForPageLoad stepKey="waitForProductPageToLoad"/>
21+
<seeElement selector="{{AdminProductGridSection.changeDefaultQuantity}}" stepKey="unselectInitialCategory"/>
22+
<click selector="{{AdminProductGridSection.changeDefaultQuantity}}" stepKey="unselectInitialCategory2"/>
23+
<fillField selector="{{AdminProductGridSection.changeDefaultQuantity}}" userInput="10" stepKey="unselectInitialCategory3"/>
24+
25+
</actionGroup>
26+
</actionGroups>

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminVerifyOrderStatusMAfterViewActionGroup.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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="AdminVerifyOrderStatusMAfterViewActionGroup">
12+
<arguments>
13+
<argument name="product_name" type="string" />
14+
<argument name="status" type="string" />
15+
</arguments>
16+
<waitForElement selector="{{AdminOrderDetailsInformationSection.orderStatusUnderViewM('product_name','status')}}" time="30" stepKey="waitForPlaceOrderButton"/>
17+
<seeElement selector="{{AdminOrderDetailsInformationSection.orderStatusUnderViewM('product_name','status')}}" stepKey="assertErrorMessage"/>
18+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
19+
</actionGroup>
20+
</actionGroups>
21+
22+

‎InventoryAdminUi/Test/Mftf/ActionGroup/AdminVerifyOrderStatusSAfterViewActionGroup.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
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="AdminVerifyOrderStatusSAfterViewActionGroup">
12+
<arguments>
13+
<argument name="product_name" type="string" />
14+
<argument name="status" type="string" />
15+
</arguments>
16+
<waitForElement selector="{{AdminOrderDetailsInformationSection.orderStatusUnderViewS('product_name','status')}}" time="30" stepKey="waitForPlaceOrderButton"/>
17+
<seeElement selector="{{AdminOrderDetailsInformationSection.orderStatusUnderViewS('product_name','status')}}" stepKey="assertErrorMessage"/>
18+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskForNextButton"/>
19+
</actionGroup>
20+
</actionGroups>

‎InventoryAdminUi/Test/Mftf/Section/AdminProductGridSection.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
<element name="qtyPerSourceInGrid" type="block" selector="//td//div[contains(text(),'{{var}}')]/../..//td[9]//div//li//strong[text()='Default Source']" parameterized="true" />
4141
<element name="qtyPerSourceOnHover" type="block" selector="//div[contains(text(),'Quantity per Source:')]/..//strong[contains(text(),'{{var1}}')]/..//span[contains(text(),'{{var2}}')]" parameterized="true" />
4242
<element name="scalableQty" type="text" selector="//span[contains(@data-bind,'salableQuantityData().qty')]"/>
43+
<element name="btnAdvancedInventory" type="button" selector="//button//span[contains(text(),'Advanced Inventory')]"/>
44+
<element name="changeDefaultQuantity" type="button" selector="//td[@data-index='name']//span[contains(text(),'Default')]/../../..//div[@data-index='quantity']/..//input[@class='admin__control-text']"/>
4345
<element name="stockStorefrontStatus" type="text" selector="//div[@title='Availability']//span[contains(text(),'{{availability}}')]" parameterized="true" timeout="30"/>
4446
<element name="selectStockStatusForChildConfigProduct" type="select" selector="//div[@class='entry-edit form-inline']//select[@name='sources[assigned_sources][0][status]']"/>
4547
</section>

‎InventoryAdminUi/Test/Mftf/Test/BackorderNotificationShouldNotBeDisplayedWhenManageStockIsSetToNoTest.xml

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
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="BackorderNotificationShouldNotBeDisplayedWhenManageStockIsSetToNoTest">
12+
<annotations>
13+
<stories value="CatalogInventory stock option"/>
14+
<title value="Backorder notification should not be displayed when manage stock is set to No."/>
15+
<description value="Backorder notification should not be displayed when manage stock is set to No"/>
16+
<testCaseId value="AC-6584"/>
17+
<severity value="CRITICAL"/>
18+
</annotations>
19+
20+
<before>
21+
<!--Create Source-->
22+
<createData entity="FullSource1" stepKey="testSource"/>
23+
<!--Create Stock-->
24+
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock"/>
25+
<!--Create Simple Product-->
26+
<createData entity="SimpleProduct" stepKey="createSimpleProduct"/>
27+
<!--Create Category-->
28+
<createData entity="_defaultCategory" stepKey="category"/>
29+
<!--Admin login-->
30+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
31+
<waitForPageLoad stepKey="waitForDashboardLoad"/>
32+
</before>
33+
<after>
34+
<!--Assign Main Website to Default Stock-->
35+
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
36+
<argument name="stockName" value="{{_defaultStock.name}}"/>
37+
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
38+
</actionGroup>
39+
<!--Clear Filter-->
40+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters"/>
41+
<!--Delete Stock-->
42+
<deleteData createDataKey="createStock" stepKey="deleteStock"/>
43+
<!--Disable Stock-->
44+
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
45+
<actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearGridFilters2"/>
46+
47+
<deleteData createDataKey="category" stepKey="deleteCategory"/>
48+
<deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
49+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
50+
</after>
51+
52+
<!--Filter Stock-->
53+
<actionGroup ref="AdminGoToStockGridFilterResultsByInputEditStock"
54+
stepKey="goToStockGridFilterResultsByInputEditStock1">
55+
<argument name="filter_selector" value="AdminManageStockGridFilterControls.name"/>
56+
<argument name="filter_value" value="$$createStock.stock[name]$$"/>
57+
</actionGroup>
58+
59+
<!-- Assign Sources to stock-->
60+
<actionGroup ref="AdminOnStockEditPageAssignSourceToStock" stepKey="onStockEditPageAssignSourceToStock1">
61+
<argument name="filter_selector" value="AdminManageStockGridFilterControls.name"/>
62+
<argument name="filter_value" value="$$testSource.source[name]$$"/>
63+
</actionGroup>
64+
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndClose1"/>
65+
66+
<!--Go to product and open product to edit-->
67+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProductEditPage">
68+
<argument name="productId" value="$createSimpleProduct.id$"/>
69+
</actionGroup>
70+
71+
<!--Add category to product-->
72+
<actionGroup ref="AdminAssignCategoryToProductAndSaveActionGroup" stepKey="assignProduct">
73+
<argument name="categoryName" value="$$category.name$$"/>
74+
</actionGroup>
75+
76+
<!--Assign Source to product and update quantity-->
77+
<actionGroup ref="AdminOnProductEditPageAssignSourceToProduct" stepKey="AdminOnProductEditPageAssignSourceToProduct1">
78+
<argument name="filter_selector" value="AdminManageSourcesGridFilterControls.code"/>
79+
<argument name="filter_value" value="$$testSource.source[source_code]$$"/>
80+
</actionGroup>
81+
82+
<!--Update Qty-->
83+
<fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="100" stepKey="fillDefaultQuantityField1"/>
84+
85+
<!--Go to Advance Inventory and Enable Backorder and disable Manage Stock as No-->
86+
<click selector="{{AdminProductSourcesSection.advancedInventory}}" stepKey="goToAdvancedInventory"/>
87+
<waitForElement selector="{{AdminAdvancedInventorySection.backordersUseDefault}}" stepKey="waitTillBackOrderIsFound"/>
88+
<uncheckOption selector="{{AdminAdvancedInventorySection.backordersUseDefault}}" stepKey="clickOnUseDefaultBackorders"/>
89+
<waitForPageLoad stepKey="waitForPageLoad"/>
90+
<selectOption selector="{{AdminAdvancedInventorySection.backorders}}" userInput="Allow Qty Below 0 and Notify Customer" stepKey="selectBackordersType"/>
91+
<click selector="{{AdminAdvancedInventorySection.manageStockUseDefault}}" stepKey="removeUseDefaultCheckBox"/>
92+
<waitForPageLoad stepKey="waitForSelect"/>
93+
<selectOption selector="{{AdminAdvancedInventorySection.manageStock}}" userInput="No" stepKey="setManageStock"/>
94+
<click selector="{{AdminAdvancedInventoryControlsSection.done}}" stepKey="clickOnDone"/>
95+
<waitForPageLoad stepKey="waitForPageLoad2"/>
96+
97+
<!--Save the product-->
98+
<actionGroup ref="AdminProductFormSaveActionGroup" stepKey="saveProduct"/>
99+
100+
<!--Open product in storefront-->
101+
<amOnPage url="{{StorefrontProductPage.url($$createSimpleProduct.custom_attributes[url_key]$$)}}" stepKey="goToProductPageOnStorefront"/>
102+
<waitForPageLoad stepKey="waitForStoreFrontProductPageLoad"/>
103+
104+
<!--Add product to cart-->
105+
<actionGroup ref="StorefrontAddSimpleProductWithQtyActionGroup" stepKey="addSimpleProductToCart">
106+
<argument name="product" value="$$createSimpleProduct$$"/>
107+
<argument name="quantity" value="101"/>
108+
</actionGroup>
109+
110+
<!-- Go to shopping cart page and Verify Qty and Error Message-->
111+
<actionGroup ref="StorefrontCartPageOpenActionGroup" stepKey="openShoppingCartPage1"/>
112+
113+
<seeInField userInput="101" selector="{{CheckoutCartProductSection.ProductQuantityByName($$createSimpleProduct.name$$)}}" stepKey="seeInQtyField20"/>
114+
<dontSeeElement selector="{{CheckoutCartMessageSection.backorderErrorMessage}}" stepKey="dontSeeBackOrderErrorMessage"/>
115+
</test>
116+
</tests>

0 commit comments

Comments
 (0)