Skip to content

Commit bd7dc1a

Browse files
author
magento packaging service
committed
Version 1.2.5-p14
1 parent cf5718a commit bd7dc1a

File tree

98 files changed

+940
-719
lines changed

Some content is hidden

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

98 files changed

+940
-719
lines changed

‎Inventory/composer.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
{
22
"name": "magento/module-inventory",
33
"description": "N/A",
4-
"require": {
5-
"php": "~7.4.0||~8.1.0",
6-
"magento/framework": "*",
7-
"magento/module-inventory-api": "*"
8-
},
94
"type": "magento2-module",
105
"license": [
116
"OSL-3.0",
127
"AFL-3.0"
138
],
9+
"version": "1.2.3",
10+
"require": {
11+
"php": "~7.4.0||~8.1.0",
12+
"magento/framework": "*",
13+
"magento/module-inventory-api": "1.2.*"
14+
},
1415
"autoload": {
1516
"files": [
1617
"registration.php"
@@ -20,3 +21,4 @@
2021
}
2122
}
2223
}
24+

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,26 @@
1919
<remove keyForRemoval="clickApplyFiltersButton"/>
2020
<remove keyForRemoval="clickOnFirstCheckbox"/>
2121
<remove keyForRemoval="enterAttributeQuantity"/>
22-
23-
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="clickCreateConfigurations"/>
24-
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
22+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
23+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="waitForCreateConfigurationsVisible" after="clickCreateConfigurations"/>
24+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="waitForCreateConfigurationsVisible"/>
25+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="waitForFirstAttributeCheckboxVisible" after="clickOnFirstAttributeCheckbox"/>
26+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="waitForFirstAttributeCheckboxVisible"/>
2527
<grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(attributeCode)}}" stepKey="grabFirstAttributeDefaultLabel" after="clickOnSecondAttributeCheckbox"/>
2628
<grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}" stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
27-
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="clickOnNextButton1"/>
28-
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFirstAttribute"/>
29+
30+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="waitForSelectAllForFirstAttributeVisible" after="clickOnNextButton1"/>
31+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="waitForSelectAllForFirstAttributeVisible"/>
32+
<waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="waitForSecondAttributeCheckboxVisible" after="clickOnSelectAllForFirstAttribute"/>
33+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="waitForSecondAttributeCheckboxVisible"/>
2934
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
3035
<click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
3136
<click selector="{{AdminConfigurableProductAssignSourcesSlideOut.assignSources}}" stepKey="openSelectSourcesModalWindow" after="clickOnApplySingleQuantityToEachSku"/>
3237
<conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearSourcesFilter" after="openSelectSourcesModalWindow"/>
3338
<fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{sourceName}}" stepKey="fillKeywordSearchField" after="clearSourcesFilter"/>
3439
<click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch" after="fillKeywordSearchField"/>
35-
<click selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="selectCustomSource" after="clickKeywordSearch"/>
40+
<waitForElementVisible selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="waitForCustomSourceVisible" after="clickKeywordSearch"/>
41+
<click selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="selectCustomSource" after="waitForCustomSourceVisible"/>
3642
<click selector="{{AdminConfigurableProductAssignSourcesSlideOut.done}}" stepKey="doneAssignSources" after="selectCustomSource"/>
3743
<fillField selector="{{AdminConfigurableProductAssignSourcesSlideOut.quantityPerSourceForMultiMode}}" userInput="100" stepKey="fillQuantityForCustomSource" after="doneAssignSources"/>
3844
</actionGroup>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<selectOption selector="{{AdminSourceSelectionFormSection.sourceSelection}}" userInput="{{sourceName}}" stepKey="selectSourceToCreateShipment"/>
2323
<waitForPageLoad stepKey="waitForSourceSelected"/>
2424
<fillField selector="{{AdminSourceSelectionOrderedItemsGrid.rowAvailableSourcesQtyToDeduct('0', '0')}}" userInput="{{sourceQty}}" stepKey="fillQuantity"/>
25+
<click selector="{{AdminSourceSelectionFormSection.sourceSelectionHeader}}" stepKey="unFocus"/>
26+
<waitForElementVisible selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="waitForCreateShipment"/>
2527
<click selector="{{AdminSourceSelectionFormSection.proceedToShipment}}" stepKey="createShipment"/>
2628
<waitForElementVisible selector="{{AdminShipmentInventorySection.sourceList}}" stepKey="waitForShipmentPage"/>
2729
<see selector="{{AdminShipmentInventorySection.sourceList}}" userInput="{{sourceName}}" stepKey="checkSourceNameOnShipmentPage"/>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,6 @@
1313
<element name="selectDistancePriority" type="button" selector=".item[title='Distance Priority']"/>
1414
<element name="proceedToShipment" type="button" selector="#save[data-ui-id='save-button']"/>
1515
<element name="sourceSelection" type="select" selector="select[name='sourceCode']"/>
16+
<element name="sourceSelectionHeader" type="text" selector=".page-title"/>
1617
</section>
1718
</sections>

‎InventoryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageDefaultStockTest.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
<click selector="{{AdminGridRow.checkboxByValue('color')}}" stepKey="selectColorAttribute"/>
8080
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="navigateToSecondStep"/>
8181

82+
<scrollTo selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="scrollToAddNewColorBlue"/>
8283
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="addNewColorBlue"/>
8384
<fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="setNameBlue"/>
8485
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="saveBlueColor"/>

‎InventoryAdminUi/Test/Mftf/Test/AdminCreateFullInvoiceForOrderWithSimpleProductOnCustomStockTest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,13 @@
5252
<deleteData createDataKey="stock" stepKey="deleteStock"/>
5353
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
5454
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
55-
<magentoCron groups="index" stepKey="reindex"/>
55+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
56+
<argument name="indices" value=""/>
57+
</actionGroup>
5658
</after>
5759

5860
<!--- Place order and create invoice. -->
59-
<actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer"/>
61+
<actionGroup ref="AdminNavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer"/>
6062
<waitForPageLoad stepKey="waitForPageLoad"/>
6163
<fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Msi_US_Customer.email}}" stepKey="fillEmailField"/>
6264
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addProductToOrder">

‎InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,14 @@
7070
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
7171
</actionGroup>
7272
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
73+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
7374
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
7475
<deleteData createDataKey="category" stepKey="deleteCategory"/>
7576
<deleteData createDataKey="additionalStock" stepKey="deleteStock"/>
7677
<deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
77-
<magentoCron groups="index" stepKey="reindex"/>
78+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
79+
<argument name="indices" value="cataloginventory_stock"/>
80+
</actionGroup>
7881
</after>
7982

8083
<!-- Login as Customer and add Product to Cart-->

‎InventoryAdminUi/Test/Mftf/Test/AdminCreatePartialInvoiceForOrderWithVirtualProductOnCustomStockTest.xml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
<actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache">
5555
<argument name="tags" value="full_page"/>
5656
</actionGroup>
57-
57+
5858
<createData entity="VirtualProduct" stepKey="virtualProduct">
5959
<requiredEntity createDataKey="category"/>
6060
</createData>
@@ -95,7 +95,9 @@
9595
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
9696
<deleteData createDataKey="virtualProduct" stepKey="deleteProduct"/>
9797
<deleteData createDataKey="customStock" stepKey="deleteCustomStock"/>
98-
<magentoCron groups="index" stepKey="reindex"/>
98+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
99+
<argument name="indices" value=""/>
100+
</actionGroup>
99101
</after>
100102

101103
<!--Create Order with Virtual product from Admin-->
@@ -143,8 +145,8 @@
143145
<argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
144146
<argument name="value" value="$$virtualProduct.sku$$"/>
145147
</actionGroup>
146-
<see selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource.source[name]$$)}}" userInput="99" stepKey="checkProductSourceQtyAfterInvoiceCreated"/>
147-
<see selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource2.source[name]$$)}}" userInput="100" stepKey="checkProductSource2QtyAfterInvoiceCreated"/>
148-
<see selector="{{AdminProductGridSection.productSalableQty('1',$$customStock.stock[name]$$)}}" userInput="197" stepKey="checkSalableQtyAfterInvoiceCreated"/>
148+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource.source[name]$$)}}" userInput="99" stepKey="checkProductSourceQtyAfterInvoiceCreated"/>
149+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1',$$customSource2.source[name]$$)}}" userInput="100" stepKey="checkProductSource2QtyAfterInvoiceCreated"/>
150+
<waitForText selector="{{AdminProductGridSection.productSalableQty('1',$$customStock.stock[name]$$)}}" userInput="197" stepKey="checkSalableQtyAfterInvoiceCreated"/>
149151
</test>
150152
</tests>

‎InventoryAdminUi/Test/Mftf/Test/AdminCreateScheduledPermanentUpdateDownloadableProductCustomStockTest.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
</annotations>
2121
<before>
2222
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com example.com"/>
23+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAfterCLICommand">
24+
<argument name="indices" value=""/>
25+
</actionGroup>
2326
<!--Create stock and source.-->
2427
<createData entity="FullSource1" stepKey="source"/>
2528
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="stock"/>
@@ -43,8 +46,12 @@
4346
<argument name="sourceCode" value="$source.source[source_code]$"/>
4447
</actionGroup>
4548
<actionGroup ref="SaveProductFormActionGroup" stepKey="SaveProductFormActionGroup"/>
46-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
47-
<magentoCLI command="cache:flush" stepKey="flushCache"/>
49+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
50+
<argument name="indices" value=""/>
51+
</actionGroup>
52+
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
53+
<argument name="tags" value=""/>
54+
</actionGroup>
4855
</before>
4956
<after>
5057
<deleteData createDataKey="product" stepKey="deleteProduct" before="disableSource"/>

‎InventoryAdminUi/Test/Mftf/Test/AdminCreateShipmentForWholeOrderWithConfigurableProductFromCustomSourceTest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,9 @@
8989
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
9090

9191
<!-- Reindex invalidated indices after product attribute has been created/deleted -->
92-
<magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
92+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexInvalidatedIndices">
93+
<argument name="indices" value=""/>
94+
</actionGroup>
9395
</after>
9496

9597
<!--Add configurable product to cart.-->
@@ -105,6 +107,7 @@
105107
<!--Place order.-->
106108
<actionGroup ref="GoToCheckoutFromMinicartActionGroup" stepKey="navigateToCheckoutPage"/>
107109
<actionGroup ref="StorefrontCheckoutClickNextButtonActionGroup" stepKey="clickOnNextButton"/>
110+
<actionGroup ref="CheckoutSelectCheckMoneyOrderPaymentActionGroup" stepKey="selectCheckMoneyOrder"/>
108111
<actionGroup ref="ClickPlaceOrderActionGroup" stepKey="clickOnPlaceOrder"/>
109112
<grabTextFrom selector="{{CheckoutSuccessMainSection.orderNumber22}}" stepKey="orderNumber"/>
110113
<!--Create Shipment-->
@@ -129,4 +132,3 @@
129132
</actionGroup>
130133
</test>
131134
</tests>
132-

0 commit comments

Comments
 (0)