Version 1.2.4-p7

magento · Feb 8, 2024 · 751ebf9 · 751ebf9
1 parent dc3fc54
commit 751ebf9
Show file tree

Hide file tree

Showing 103 changed files with 1,084 additions and 697 deletions.
diff --git a/Inventory/composer.json b/Inventory/composer.json
@@ -1,16 +1,17 @@
 {
     "name": "magento/module-inventory",
     "description": "N/A",
-    "require": {
-        "php": "~7.4.0||~8.1.0",
-        "magento/framework": "*",
-        "magento/module-inventory-api": "*"
-    },
     "type": "magento2-module",
     "license": [
         "OSL-3.0",
         "AFL-3.0"
     ],
+    "version": "1.2.2",
+    "require": {
+        "php": "~7.4.0||~8.1.0",
+        "magento/framework": "*",
+        "magento/module-inventory-api": "1.2.*"
+    },
     "autoload": {
         "files": [
             "registration.php"
@@ -20,3 +21,4 @@
         }
     }
 }
+
diff --git a/InventoryAdminUi/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml b/InventoryAdminUi/Test/Mftf/ActionGroup/AdminConfigurableProductActionGroup.xml
@@ -19,20 +19,26 @@
         <remove keyForRemoval="clickApplyFiltersButton"/>
         <remove keyForRemoval="clickOnFirstCheckbox"/>
         <remove keyForRemoval="enterAttributeQuantity"/>
-
-        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="clickCreateConfigurations"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="waitForCreateConfigurationsVisible" after="clickCreateConfigurations"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="waitForCreateConfigurationsVisible"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="waitForFirstAttributeCheckboxVisible" after="clickOnFirstAttributeCheckbox"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="waitForFirstAttributeCheckboxVisible"/>
         <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(attributeCode)}}" stepKey="grabFirstAttributeDefaultLabel" after="clickOnSecondAttributeCheckbox"/>
         <grabTextFrom selector="{{AdminCreateProductConfigurationsPanel.defaultLabel(secondAttributeCode)}}" stepKey="grabSecondAttributeDefaultLabel" after="grabFirstAttributeDefaultLabel"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="clickOnNextButton1"/>
-        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="clickOnSelectAllForFirstAttribute"/>
+
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="waitForSelectAllForFirstAttributeVisible" after="clickOnNextButton1"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="waitForSelectAllForFirstAttributeVisible"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="waitForSecondAttributeCheckboxVisible" after="clickOnSelectAllForFirstAttribute"/>
+        <click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="waitForSecondAttributeCheckboxVisible"/>
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
         <click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
         <click selector="{{AdminConfigurableProductAssignSourcesSlideOut.assignSources}}" stepKey="openSelectSourcesModalWindow" after="clickOnApplySingleQuantityToEachSku"/>
         <conditionalClick selector="{{AdminDataGridHeaderSection.clearFilters}}" dependentSelector="{{AdminDataGridHeaderSection.clearFilters}}" visible="true" stepKey="clearSourcesFilter" after="openSelectSourcesModalWindow"/>
         <fillField selector="{{AdminDataGridHeaderSection.search}}" userInput="{{sourceName}}" stepKey="fillKeywordSearchField" after="clearSourcesFilter"/>
         <click selector="{{AdminDataGridHeaderSection.submitSearch}}" stepKey="clickKeywordSearch" after="fillKeywordSearchField"/>
-        <click selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="selectCustomSource" after="clickKeywordSearch"/>
+        <waitForElementVisible selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="waitForCustomSourceVisible" after="clickKeywordSearch"/>
+        <click selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="selectCustomSource" after="waitForCustomSourceVisible"/>
         <click selector="{{AdminConfigurableProductAssignSourcesSlideOut.done}}" stepKey="doneAssignSources" after="selectCustomSource"/>
         <fillField selector="{{AdminConfigurableProductAssignSourcesSlideOut.quantityPerSourceForMultiMode}}" userInput="100" stepKey="fillQuantityForCustomSource" after="doneAssignSources"/>
     </actionGroup>

diff --git a/...ryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnCustomStockTest.xml b/...ryAdminUi/Test/Mftf/Test/AdminConfigurableProductDisabledManageStockOnCustomStockTest.xml
@@ -65,7 +65,8 @@
 
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$category.name$$]"  stepKey="searchAndSelectCategory"/>
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton"/>
-        <waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" time="30" stepKey="waitForGridPresents"/>
+        <waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" stepKey="waitForGridPresents"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForConfigurationsPage"/>
 
         <click selector="{{AdminGridRow.checkboxByValue('color')}}" stepKey="selectColorAttribute"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="navigateToSecondStep"/>

diff --git a/...st/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageDefaultStockTest.xml b/...st/Mftf/Test/AdminConfigurableProductDisabledManageStockOnProductPageDefaultStockTest.xml
@@ -79,6 +79,7 @@
         <click selector="{{AdminGridRow.checkboxByValue('color')}}" stepKey="selectColorAttribute"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="navigateToSecondStep"/>
 
+        <scrollTo selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="scrollToAddNewColorBlue"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="addNewColorBlue"/>
         <fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="setNameBlue"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="saveBlueColor"/>

diff --git a/...Test/Mftf/Test/AdminCreateFullInvoiceForOrderWithDownloadableProductOnCustomStockTest.xml b/...Test/Mftf/Test/AdminCreateFullInvoiceForOrderWithDownloadableProductOnCustomStockTest.xml
@@ -39,8 +39,8 @@
             </createData>
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminPanel"/>
             <!-- Assign source to product. -->
-            <actionGroup ref="NavigateToCreatedProductEditPageActionGroup" stepKey="navigateToProductEditPage">
-                <argument name="product" value="$$product$$"/>
+            <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="navigateToProductEditPage">
+                <argument name="productId" value="$$product.id$$"/>
             </actionGroup>
             <actionGroup ref="AdminAssignSourceToProductAndSetSourceQuantityActionGroup" stepKey="assignTestSourceToCreatedProduct" >
                 <argument name="sourceCode" value="$$source.source[source_code]$$"/>
@@ -60,10 +60,13 @@
             <deleteData createDataKey="stock" stepKey="deleteStock"/>
             <actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
         </after>
 
         <!--- Place order and create invoice. -->
-        <actionGroup ref="NavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer"/>
+        <actionGroup ref="AdminNavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer"/>
         <waitForPageLoad stepKey="waitForPageLoad"/>
         <fillField selector="{{AdminOrderFormAccountSection.email}}" userInput="{{Msi_US_Customer.email}}" stepKey="fillEmailField"/>
         <actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addProductToOrder">

diff --git a/...reatePartialCreditMemoPartialShipmentPartialInvoiceConfigurableProductCustomStockTest.xml b/...reatePartialCreditMemoPartialShipmentPartialInvoiceConfigurableProductCustomStockTest.xml
@@ -39,11 +39,12 @@
         <click selector="{{AdminCreditMemoItemsSection.itemReturnToStock('1')}}" stepKey="returnToStockCheckbox"/>
         <fillField selector="{{AdminCreditMemoItemsSection.itemQtyToRefund('1')}}" userInput="1" stepKey="partialRefund"/>
         <click selector="{{AdminCreditMemoItemsSection.updateQty}}" stepKey="updateQuantityToRefund"/>
-        <waitForLoadingMaskToDisappear stepKey="updateQuantityLoadingMask"/>
+        <waitForPageLoad stepKey="updateQuantityLoadingMask"/>
         <click selector="{{AdminCreditMemoTotalSection.submitRefundOffline}}" stepKey="clickSubmit"/>
         <!--Verify product quantity.-->
-        <amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductGridAfterCreditMemo"/>
-        <waitForPageLoad time="30" stepKey="waitForGridLoadAfterCreditMemo"/>
+        <actionGroup ref="AdminOpenProductIndexPageActionGroup" stepKey="navigateToProductGridAfterCreditMemo"/>
+        <comment userInput="BIC workaround" stepKey="waitForGridLoadAfterCreditMemo"/>
+        <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetGrid"/>
         <actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="findProductForQuantityCheckAfterCreditMemo">
             <argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
             <argument name="value" value="{{ConfigurableMsiProduct.sku}}"/>

diff --git a/.../Test/Mftf/Test/AdminCreateScheduledPermanentUpdateDownloadableProductCustomStockTest.xml b/.../Test/Mftf/Test/AdminCreateScheduledPermanentUpdateDownloadableProductCustomStockTest.xml
@@ -20,6 +20,9 @@
         </annotations>
         <before>
             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com example.com"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAfterCLICommand">
+              <argument name="indices" value=""/>
+            </actionGroup>
             <!--Create stock and source.-->
             <createData entity="FullSource1" stepKey="source"/>
             <createData entity="BasicMsiStockWithMainWebsite1" stepKey="stock"/>

diff --git a/...est/Mftf/Test/AdminDownloadableProductOutOfStockThresholdConfigurationCustomStockTest.xml b/...est/Mftf/Test/AdminDownloadableProductOutOfStockThresholdConfigurationCustomStockTest.xml
@@ -20,6 +20,9 @@
 
         <before>
             <magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAfterCLICommand">
+              <argument name="indices" value=""/>
+            </actionGroup>
             <!--Create test data.-->
             <createData entity="_minimalSource" stepKey="source"/>
             <createData entity="BasicMsiStockWithMainWebsite1" stepKey="stock"/>

diff --git a/...nUi/Test/Mftf/Test/AdminManageStockInConfigurationTurnedOffForDownloadableProductTest.xml b/...nUi/Test/Mftf/Test/AdminManageStockInConfigurationTurnedOffForDownloadableProductTest.xml
@@ -35,9 +35,11 @@
             <createData entity="downloadableLink1" stepKey="downloadableLink">
                 <requiredEntity createDataKey="product"/>
             </createData>
-            <!--Assign created source to product and set product sock status to out of stock.-->
+            <!--Assign created source to product and set product stock status to out of stock.-->
             <actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdminArea"/>
-            <amOnPage url="{{AdminProductEditPage.url($$product.id$$)}}" stepKey="openProductEditPageToAssignSource"/>
+            <actionGroup ref="AdminProductPageOpenByIdActionGroup" stepKey="openProductEditPageToAssignSource">
+                <argument name="productId" value="$$product.id$$"/>
+            </actionGroup>
             <actionGroup ref="UnassignSourceFromProductActionGroup" stepKey="unassignDefaultSourceFromProduct">
                 <argument name="sourceCode" value="{{_defaultSource.name}}"/>
             </actionGroup>
@@ -49,14 +51,18 @@
                 <argument name="sourceStatus" value="{{SourceStatusOutOfStock.value}}"/>
             </actionGroup>
             <actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveProduct"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
         <after>
             <!--Turn on Manage Stock.-->
             <magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="enableManageStock"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <comment userInput="BIC workaround" stepKey="reindex"/>
+            <comment userInput="BIC workaround" stepKey="flushCache"/>
             <!--Delete test data.-->
             <deleteData createDataKey="product" stepKey="deleteProduct"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
@@ -72,21 +78,31 @@
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
             <magentoCLI stepKey="removeDownloadableDomain" command="downloadable:domains:remove static.magento.com example.com"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex2">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCache2">
+                <argument name="tags" value="config full_page"/>
+            </actionGroup>
         </after>
 
         <!--Verify product is not visible on storefront.-->
         <actionGroup ref="AssertStorefrontProductAbsentOnCategoryPageActionGroup" stepKey="verifyProductNotVisibleOnStorefront">
-            <argument name="categoryUrlKey" value="$category.url_key$"/>
-            <argument name="productName" value="$product.name$"/>
+            <argument name="categoryUrlKey" value="$$category.url_key$$"/>
+            <argument name="productName" value="$$product.name$$"/>
         </actionGroup>
         <!-- Turn off Manage Stock-->
         <magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="disableManageStock"/>
-        <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-        <magentoCLI command="cache:flush" stepKey="flushCache"/>
+        <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+            <argument name="indices" value=""/>
+        </actionGroup>
+        <actionGroup ref="CliCacheCleanActionGroup" stepKey="flushCache">
+            <argument name="tags" value="config full_page"/>
+        </actionGroup>
         <!-- Check product is visible on Storefront-->
         <actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="verifyProductVisibleOnStorefront">
-            <argument name="category" value="$category$"/>
-            <argument name="product" value="$product$"/>
+            <argument name="category" value="$$category$$"/>
+            <argument name="product" value="$$product$$"/>
         </actionGroup>
     </test>
 </tests>
diff --git a/...derCreatedForGuestCustomerWithConfigurableProductWithDropDownAttributeViaTheAdminTest.xml b/...derCreatedForGuestCustomerWithConfigurableProductWithDropDownAttributeViaTheAdminTest.xml
@@ -76,7 +76,7 @@
         <waitForPageLoad stepKey="waitForPageLoad3"/>
 
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton1"/>
-        <waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" time="30" stepKey="waitForGridPresent1"/>
+        <waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" stepKey="waitForGridPresent1"/>
 
         <waitForPageLoad stepKey="waitForPageLoad4"/>
         <click selector="{{AdminGridRow.checkboxByValue('color')}}" stepKey="clickOnTheColorAttribute1"/>

diff --git a/InventoryAdminUi/Test/Mftf/Test/AdminSaveTwiceDuringCreatingConfigurableProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/AdminSaveTwiceDuringCreatingConfigurableProductTest.xml
@@ -71,12 +71,12 @@
 
         <click selector="{{AdminGridRow.checkboxByValue('color')}}" stepKey="selectColorAttribute"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="navigateToSecondStep"/>
-
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="waitForAddNew"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="addNewColorWhite"/>
         <fillField userInput="{{colorProductAttribute1.name}}"
                    selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="setNameWhite"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="saveWhiteColor"/>
-
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="waitForAddNewButton"/>
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="addNewColorRed"/>
         <fillField userInput="{{colorProductAttribute2.name}}"
                    selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="setNameRed"/>

diff --git a/InventoryAdminUi/composer.json b/InventoryAdminUi/composer.json
@@ -1,21 +1,22 @@
 {
     "name": "magento/module-inventory-admin-ui",
     "description": "N/A",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
+    ],
+    "version": "1.2.2-p7",
     "require": {
         "php": "~7.4.0||~8.1.0",
         "magento/framework": "*",
-        "magento/module-inventory": "*",
-        "magento/module-inventory-api": "*",
-        "magento/module-inventory-catalog-api": "*",
+        "magento/module-inventory": "1.2.*",
+        "magento/module-inventory-api": "1.2.*",
+        "magento/module-inventory-catalog-api": "1.3.*",
         "magento/module-backend": "*",
         "magento/module-directory": "*",
         "magento/module-ui": "*"
     },
-    "type": "magento2-module",
-    "license": [
-        "OSL-3.0",
-        "AFL-3.0"
-    ],
     "autoload": {
         "files": [
             "registration.php"
@@ -25,3 +26,4 @@
         }
     }
 }
+
diff --git a/InventoryAdminUi/view/adminhtml/ui_component/inventory_source_listing.xml b/InventoryAdminUi/view/adminhtml/ui_component/inventory_source_listing.xml
@@ -17,6 +17,7 @@
                 <url path="*/*/new"/>
                 <class>primary</class>
                 <label translate="true">Add New Source</label>
+                <aclResource>Magento_InventoryApi::source_edit</aclResource>
             </button>
         </buttons>
         <spinner>inventory_source_listing_columns</spinner>

diff --git a/...reateOrderWithConfigurableProductCustomStockCustomWebsiteBySkuFromCustomerAccountTest.xml b/...reateOrderWithConfigurableProductCustomStockCustomWebsiteBySkuFromCustomerAccountTest.xml
@@ -104,7 +104,8 @@
             <argument name="storeCode" value="customStore.code"/>
         </actionGroup>
         <!--Place order from storefront.-->
-        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout" after="clickUpdateCart"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitForProceedToCheckoutButtonVisible" after="clickUpdateCart" />
+        <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout" after="waitForProceedToCheckoutButtonVisible"/>
         <!-- Fill customer new shipping address -->
         <actionGroup ref="CustomerCheckoutFillNewShippingAddressActionGroup" stepKey="fillShippingAddress">
             <argument name="address" value="US_Address_TX"/>