Skip to content

Commit bc0dfe1

Browse files
magento-devops-queue-mgr-svcmagento-devops-queue-mgr-svc
authored
Merge branch 'develop' into graphql-api-enhancements
2 parents 2925dfa + 9f3e63d commit bc0dfe1

File tree

66 files changed

+666
-104
lines changed

Some content is hidden

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

66 files changed

+666
-104
lines changed

‎Inventory/Test/Unit/Model/SourceItem/Validator/SkuValidatorTest.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ protected function setUp(): void
6161
/**
6262
* @return array
6363
*/
64-
public function sourceDataProvider(): array
64+
public static function sourceDataProvider(): array
6565
{
6666
return [
6767
[

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="AdminSetByDefaultNotifyQuantityBelowActionGroup">
10+
<annotations>
11+
<description>Admin set by default Notify Quantity Below on Inventory page.</description>
12+
</annotations>
13+
14+
<magentoCLI command="config:set {{ByDefaultNotifyQuantityBelow.path}} {{ByDefaultNotifyQuantityBelow.value}}" stepKey="setByDefaultAmount"/>
15+
</actionGroup>
16+
</actionGroups>

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
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="AdminSetCustomNotifyQuantityBelowActionGroup">
10+
<annotations>
11+
<description>Admin set Custom Notify Quantity Below on Inventory page.</description>
12+
</annotations>
13+
14+
<magentoCLI command="config:set {{CustomNotifyQuantityBelow.path}} {{CustomNotifyQuantityBelow.value}}" stepKey="setCustomAmount"/>
15+
</actionGroup>
16+
</actionGroups>

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
10+
<actionGroup name="AdminSwitchWebsiteNoConfirmationActionGroup" extends="AdminSwitchWebsiteActionGroup">
11+
<remove keyForRemoval="waitingForInformationModal"/>
12+
<remove keyForRemoval="confirmStoreSwitch"/>
13+
</actionGroup>
14+
</actionGroups>

‎InventoryAdminUi/Test/Mftf/Data/CatalogInventoryConfigData.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@
9898
<data key="path">cataloginventory/item_options/notify_stock_qty</data>
9999
<data key="value">0</data>
100100
</entity>
101+
<entity name="CustomNotifyQuantityBelow">
102+
<data key="path">cataloginventory/item_options/notify_stock_qty</data>
103+
<data key="value">101</data>
104+
</entity>
105+
<entity name="ByDefaultNotifyQuantityBelow">
106+
<data key="path">cataloginventory/item_options/notify_stock_qty</data>
107+
<data key="value">1</data>
108+
</entity>
101109
<entity name="OfflineDistanceProviderForDistanceBasedSSA">
102110
<data key="path">cataloginventory/source_selection_distance_based/provider</data>
103111
<data key="value">offline</data>

‎InventoryAdminUi/Test/Mftf/Test/AdminReportsLowStockInScopeOfWebsitesTest.xml‎

Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
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" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
10+
<test name="AdminReportsLowStockInScopeOfWebsitesTest">
11+
<annotations>
12+
<features value="Reports"/>
13+
<stories value="Admin verifies low stock reports work correctly in scope of websites"/>
14+
<title value="low stock reports work correctly in scope of websites."/>
15+
<description value="The testcase intends to verify low stock reports work correctly in scope of websites."/>
16+
<testCaseId value="AC-6555"/>
17+
<severity value="MAJOR"/>
18+
</annotations>
19+
<before>
20+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
21+
<createData entity="NewSubCategoryUnderDefaultCategory" stepKey="createPreReqCategory"/>
22+
<createData entity="SimpleProduct" stepKey="createFirstSimpleProduct">
23+
<field key="quantity">10.00</field>
24+
<requiredEntity createDataKey="createPreReqCategory"/>
25+
</createData>
26+
<createData entity="SimpleProduct" stepKey="createSecondSimpleProduct">
27+
<requiredEntity createDataKey="createPreReqCategory"/>
28+
</createData>
29+
<!-- Step Create website-->
30+
<actionGroup ref="AdminCreateWebsiteActionGroup" stepKey="createWebsite">
31+
<argument name="newWebsiteName" value="{{customWebsite.name}}"/>
32+
<argument name="websiteCode" value="{{customWebsite.code}}"/>
33+
</actionGroup>
34+
<!-- Step Create second store -->
35+
<actionGroup ref="CreateCustomStoreActionGroup" stepKey="createCustomStore">
36+
<argument name="website" value="{{customWebsite.name}}"/>
37+
<argument name="store" value="{{customStoreGroup.name}}"/>
38+
<argument name="rootCategory" value="Default Category"/>
39+
</actionGroup>
40+
<!-- Step Create second store view -->
41+
<actionGroup ref="AdminCreateStoreViewActionGroup" stepKey="createCustomStoreView">
42+
<argument name="StoreGroup" value="customStoreGroup"/>
43+
<argument name="customStore" value="customStoreEN"/>
44+
</actionGroup>
45+
<createData entity="FullSource1" stepKey="createTestSource1"/>
46+
<actionGroup ref="AdminCreateNewStockActionGroup" stepKey="createNewStockWithTestWebsite">
47+
<argument name="assignSource" value="$$createTestSource1.source[name]$$"/>
48+
<argument name="stockName" value="Test Stock 1"/>
49+
<argument name="websiteName" value="{{customWebsite.name}}"/>
50+
</actionGroup>
51+
</before>
52+
<after>
53+
<!--Delete created data-->
54+
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstSimpleProduct"/>
55+
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondSimpleProduct"/>
56+
<deleteData createDataKey="createPreReqCategory" stepKey="deletePreReqCategory"/>
57+
<!--Delete website-->
58+
<actionGroup ref="AdminDeleteWebsiteActionGroup" stepKey="deleteWebsite">
59+
<argument name="websiteName" value="{{customWebsite.name}}"/>
60+
</actionGroup>
61+
<actionGroup ref="AdminDeleteStockActionGroup" stepKey="deleteCreatedStock">
62+
<argument name="stockName" value="Test Stock 1"/>
63+
</actionGroup>
64+
<!--Disable all sources.-->
65+
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="deleteSource"/>
66+
<actionGroup ref="AdminSetByDefaultNotifyQuantityBelowActionGroup" stepKey="revertNotifyQuantityBelowConfig"/>
67+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logOutOfAdmin"/>
68+
</after>
69+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openFirstProductEditPage">
70+
<argument name="productId" value="$createFirstSimpleProduct.id$"/>
71+
</actionGroup>
72+
<waitForElementVisible selector="{{AdminProductSourcesGrid.rowQty('0')}}" stepKey="waitForQtyFieldToBeVisibleForDefaultSource"/>
73+
<fillField selector="{{AdminProductSourcesGrid.rowQty('0')}}" userInput="100" stepKey="fillQtyField"/>
74+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveFirstSimpleProduct"/>
75+
<!-- Assign Test source to simple product -->
76+
<actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openSecondProductEditPage">
77+
<argument name="productId" value="$createSecondSimpleProduct.id$"/>
78+
</actionGroup>
79+
<actionGroup ref="UnassignSourceFromProductActionGroup" stepKey="unAssignDefaultSourceFromProduct">
80+
<argument name="sourceCode" value="{{_defaultSource.name}}"/>
81+
</actionGroup>
82+
<actionGroup ref="AdminAssignSourceToProductAndSetSourceQuantityActionGroup" stepKey="assignCreatedTestSource">
83+
<argument name="sourceCode" value="$createTestSource1.source[source_code]$"/>
84+
</actionGroup>
85+
<waitForElementVisible selector="{{AdminProductSourcesGrid.rowQty('0')}}" stepKey="waitForQtyFieldToBeVisible"/>
86+
<fillField selector="{{AdminProductSourcesGrid.rowQty('0')}}" userInput="100" stepKey="fillSourceQtyField"/>
87+
<actionGroup ref="AdminAssignProductInWebsiteActionGroup" stepKey="assignProductToSecondWebsite">
88+
<argument name="website" value="{{customWebsite.name}}"/>
89+
</actionGroup>
90+
<actionGroup ref="AdminUnassignProductInWebsiteActionGroup" stepKey="unAssignProductFromDefaultWebsite">
91+
<argument name="website" value="{{_defaultWebsite.name}}"/>
92+
</actionGroup>
93+
<actionGroup ref="SaveProductFormActionGroup" stepKey="saveSecondSimpleProduct"/>
94+
<actionGroup ref="AdminSetCustomNotifyQuantityBelowActionGroup" stepKey="setCustomNotifyQtyAmount"/>
95+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
96+
<argument name="indices" value="catalogsearch_fulltext catalog_category_product catalog_product_price catalogrule_rule"/>
97+
</actionGroup>
98+
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
99+
<argument name="tags" value="config full_page"/>
100+
</actionGroup>
101+
<actionGroup ref="AdminOpenLowStockReportPageActionGroup" stepKey="openLowStockPage"/>
102+
<actionGroup ref="AdminSwitchWebsiteNoConfirmationActionGroup" stepKey="AdminSwitchStoreViewToMainWebsite">
103+
<argument name="website" value="_defaultWebsite"/>
104+
</actionGroup>
105+
<actionGroup ref="AdminVerifyLowStockProductReportActionGroup" stepKey="verifyFirstProductReport">
106+
<argument name="product" value="$$createFirstSimpleProduct$$"/>
107+
<argument name="productQty" value="100"/>
108+
<argument name="source" value="_defaultSource"/>
109+
</actionGroup>
110+
<actionGroup ref="AdminSwitchWebsiteNoConfirmationActionGroup" stepKey="AdminSwitchStoreViewToCustomWebsite">
111+
<argument name="website" value="customWebsite"/>
112+
</actionGroup>
113+
<actionGroup ref="AdminVerifyLowStockProductReportActionGroup" stepKey="verifySecondProductReport">
114+
<argument name="product" value="$$createSecondSimpleProduct$$"/>
115+
<argument name="productQty" value="100"/>
116+
<argument name="source" value="$$createTestSource1$$"/>
117+
</actionGroup>
118+
</test>
119+
</tests>

‎InventoryAdminUi/Test/Mftf/Test/StockStatusChangedForBundleProductOnTestStockAndTestWebsiteTest.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<severity value="CRITICAL"/>
1818
<group value="msi"/>
1919
<group value="multi_mode"/>
20+
<!-- will be fixed in the scope of ACQE-6589 -->
21+
<group value="pr_exclude"/>
2022
</annotations>
2123

2224
<before>

‎InventoryAdminUi/Test/Mftf/Test/StorefrontCreateOrderAllQuantityGroupedProductOptionDefaultStockTest.xml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,11 @@
8484
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
8585
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
8686
<!--Run queue consumer.-->
87-
<magentoCLI command="queue:consumers:start" arguments="inventory.reservations.updateSalabilityStatus" stepKey="startSalabilityUpdate" timeout="30"/>
87+
<magentoCLI command="queue:consumers:start" arguments="inventory.reservations.updateSalabilityStatus" stepKey="startSalabilityUpdate" timeout="60"/>
88+
<wait time="30" stepKey="waitForSalabilityUpdate"/>
89+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
90+
<argument name="tags" value=""/>
91+
</actionGroup>
8892
<!--Navigate to group product PDP.-->
8993
<actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="navigateToGroupedProductPDPAfterOrderPlacement">
9094
<argument name="product" value="$groupedProduct$"/>

‎InventoryAdminUi/Test/Mftf/Test/StorefrontPriceOfConfigurableProductAssignedToTestStockAndTestWebsiteWhenOptionOfDisplayingOutOfStockProductsEnabledTest.xml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
<group value="msi"/>
1919
<group value="multi_mode"/>
2020
<group value="pr_exclude"/>
21+
<skip>
22+
<issueId value="AC-10843"/>
23+
</skip>
2124
</annotations>
2225

2326
<before>

‎InventoryAdminUi/Test/Mftf/Test/StorefrontValidateGroupedProductDisappearAfterEditingStockStatusToOutOfStockTest.xml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="StorefrontValidateGroupedProductDisappearAfterEditingStockStatusToOutOfStockTest">
12+
<annotations>
13+
<stories value="Group Product Custom Stock."/>
14+
<title value="Validate that Grouped product gets disappear after editing stock status to out of stock"/>
15+
<description value="Admin create a grouped product and validate that Grouped product gets disappear after editing stock status to out of stock"/>
16+
<testCaseId value="AC-2834"/>
17+
<severity value="MINOR"/>
18+
</annotations>
19+
<actionGroup ref="AdminUpdateAssignSourceItemStatusOutOfStockForSimpleProduct" after="openProductToUpdateStock" stepKey="setOutOfStockForSimpleProduct">
20+
<argument name="sourceName" value="$$createSource.source[name]$$"/>
21+
</actionGroup>
22+
</test>
23+
</tests>

0 commit comments

Comments
 (0)