Version 1.2.5-p7

magento · Apr 4, 2024 · 16fb31c · 16fb31c
1 parent cf5718a
commit 16fb31c
Show file tree

Hide file tree

Showing 83 changed files with 857 additions and 653 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.3",
+    "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/...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/...t/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml b/...t/Mftf/Test/AdminCreatePartialCreditMemoFullInvoiceConfigurableProductCustomStockTest.xml
@@ -70,11 +70,14 @@
                 <argument name="websiteName" value="{{_defaultWebsite.name}}"/>
             </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
+            <actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logoutCustomer"/>
             <deleteData createDataKey="customer" stepKey="deleteCustomer"/>
             <deleteData createDataKey="category" stepKey="deleteCategory"/>
             <deleteData createDataKey="additionalStock" stepKey="deleteStock"/>
             <deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
-            <magentoCron groups="index" stepKey="reindex"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+              <argument name="indices" value="cataloginventory_stock"/>
+            </actionGroup>
         </after>
 
         <!-- Login as Customer and add Product to Cart-->

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"/>
@@ -43,8 +46,12 @@
                 <argument name="sourceCode" value="$source.source[source_code]$"/>
             </actionGroup>
             <actionGroup ref="SaveProductFormActionGroup" stepKey="SaveProductFormActionGroup"/>
-            <magentoCLI command="indexer:reindex" stepKey="reindex"/>
-            <magentoCLI command="cache:flush" stepKey="flushCache"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
+              <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache">
+              <argument name="tags" value=""/>
+            </actionGroup>
         </before>
         <after>
             <deleteData createDataKey="product" stepKey="deleteProduct" before="disableSource"/>

diff --git a/...OrderCreatedForGuestCustomerWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml b/...OrderCreatedForGuestCustomerWithConfigurableProductWithSwatchAttributeViaTheAdminTest.xml
@@ -72,28 +72,34 @@
         <searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$simpleCategory1.name$$]"  stepKey="searchAndSelectCategory1"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
 
+        <waitForElementVisible selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="waitForCreateConfigurationsButtonVisible" />
         <click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnTheCreateConfigurationsButton1"/>
         <waitForElementVisible selector="{{AdminConfigurableProductSelectAttributesSlideOut.grid}}" time="30" stepKey="waitForGridPresent1"/>
 
         <waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="waitForCreateNewAttributeButtonVisible" />
         <click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnCreateNewAttribute1"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
 
         <switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame1"/>
         <fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{visualSwatchAttribute.name}}" stepKey="fillDefaultLabel1"/>
         <selectOption selector="#frontend_input" userInput="{{visualSwatchAttribute.catalogInputType}}" stepKey="fillCatalogInputTypeForStoreOwner1"/>
 
-        <click selector="#add_new_swatch_visual_option_button" stepKey="clickOnAddSwatch1"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.addVisualSwatchOption}}" stepKey="waitForAddSwatch1ButtonVisible" />
+        <click selector="{{AdminNewAttributePanel.addVisualSwatchOption}}" stepKey="clickOnAddSwatch1"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad6"/>
 
-        <fillField selector="input[name='optionvisual[value][option_0][0]']" userInput="{{visualSwatchColor1.name}}" stepKey="fillAdminName1"/>
-        <fillField selector="input[name='optionvisual[value][option_0][1]']" userInput="{{visualSwatchColor1.name}}" stepKey="fillAdminName2"/>
+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.visualSwatchAdmin('0')}}" stepKey="waitForVisualSwatch1FieldVisible" />
+        <fillField selector="{{AdminCreateNewProductAttributeSection.visualSwatchStore('0')}}" userInput="{{visualSwatchColor1.name}}" stepKey="fillAdminName1"/>
+        <fillField selector="{{AdminCreateNewProductAttributeSection.visualSwatchAdmin('0')}}" userInput="{{visualSwatchColor1.name}}" stepKey="fillAdminName2"/>
 
-        <click selector="#add_new_swatch_visual_option_button" stepKey="clickOnAddSwatch2"/>
+        <waitForElementVisible selector="{{AdminNewAttributePanel.addVisualSwatchOption}}" stepKey="waitForAddSwatch2ButtonVisible" />
+        <click selector="{{AdminNewAttributePanel.addVisualSwatchOption}}" stepKey="clickOnAddSwatch2"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad7"/>
 
-        <fillField selector="input[name='optionvisual[value][option_1][0]']" userInput="{{visualSwatchColor2.name}}" stepKey="fillAdminName3"/>
-        <fillField selector="input[name='optionvisual[value][option_1][1]']" userInput="{{visualSwatchColor2.name}}" stepKey="fillAdminName4"/>
+        <waitForElementVisible selector="{{AdminCreateNewProductAttributeSection.visualSwatchAdmin('1')}}" stepKey="waitForVisualSwatchFieldVisible" />
+        <fillField selector="{{AdminCreateNewProductAttributeSection.visualSwatchStore('1')}}" userInput="{{visualSwatchColor2.name}}" stepKey="fillAdminName3"/>
+        <fillField selector="{{AdminCreateNewProductAttributeSection.visualSwatchAdmin('1')}}" userInput="{{visualSwatchColor2.name}}" stepKey="fillAdminName4"/>
 
         <click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel1"/>
         <waitForPageLoad stepKey="waitForPageLoad8"/>
@@ -106,12 +112,18 @@
             <argument name="value" value="{{visualSwatchAttribute.name}}"/>
         </actionGroup>
 
+        <waitForElementVisible selector="{{AdminGridRow.checkboxByValue(visualSwatchAttribute.name)}}" stepKey="waitForClickOnTheColorAttribute1" />
         <click selector="{{AdminGridRow.checkboxByValue(visualSwatchAttribute.name)}}" stepKey="clickOnTheColorAttribute1"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForClickOnNextButton1" />
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="waitForClickOnSelectAll1" />
         <click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll1"/>
 
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForClickOnNextButton2" />
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="waitForClickOnApplySingleQuantityToEachSku1" />
         <click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku1"/>
+        <waitForElementVisible selector="{{AdminConfigurableProductAssignSourcesSlideOut.assignSources}}" stepKey="waitForClickOnAssignSources2" />
         <click selector="{{AdminConfigurableProductAssignSourcesSlideOut.assignSources}}" stepKey="clickOnAssignSources2"/>
 
         <waitForPageLoad time="30" stepKey="waitForPageLoad"/>
@@ -122,22 +134,27 @@
             <argument name="value" value="$$createSource1.source[source_code]$$"/>
         </actionGroup>
         <click selector="{{AdminGridRow.checkboxByValue($$createSource1.source[name]$$)}}" stepKey="clickOnTheCheckboxForSource2"/>
+        <waitForElementVisible selector="{{AdminConfigurableProductAssignSourcesSlideOut.done}}" stepKey="waitForClickOnDone3" />
         <click selector="{{AdminConfigurableProductAssignSourcesSlideOut.done}}" stepKey="clickOnDone3"/>
 
         <fillField selector="{{AdminConfigurableProductAssignSourcesSlideOut.quantityPerSourceForMultiMode}}" userInput="100" stepKey="fillTheQuantityField1"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForClickOnNextButton4" />
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
+        <waitForElementVisible selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="waitForClickOnNextButton5" />
         <click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton5"/>
 
+        <waitForElementVisible selector="{{AdminProductFormActionSection.saveButton}}" stepKey="waitForClickOnSaveButton2" />
         <click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
+        <waitForElementVisible selector="button[data-index='confirm_button']" stepKey="waitForClickOnConfirm1" />
         <click selector="button[data-index='confirm_button']" stepKey="clickOnConfirm1"/>
         <waitForPageLoad stepKey="waitForPageLoad10"/>
-        <seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage1"/>
+        <waitForElementVisible selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage1"/>
 
         <amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage1"/>
         <waitForPageLoad time="30" stepKey="waitForPageLoad11"/>
 
         <click selector="{{AdminOrdersGridSection.createNewOrder}}" stepKey="clickOnCreateNewOrder1"/>
-
+        <waitForElementVisible selector="button[title='Create New Customer']" stepKey="waitForClickOnCreateNewCustomer1" />
         <click selector="button[title='Create New Customer']" stepKey="clickOnCreateNewCustomer1"/>
         <waitForPageLoad stepKey="waitForPageLoad12"/>
 

diff --git a/InventoryAdminUi/Test/Mftf/Test/ElasticSearchQuickAdvancedSearchDefaultStockProductTest.xml b/InventoryAdminUi/Test/Mftf/Test/ElasticSearchQuickAdvancedSearchDefaultStockProductTest.xml
@@ -49,9 +49,13 @@
                 <requiredEntity createDataKey="additionalSource"/>
             </createData>
 
-            <magentoCron groups="index" stepKey="reindexInvalidatedIndices"/>
-            <magentoCLI command="indexer:reindex" arguments="catalogsearch_fulltext" stepKey="performReindexAfterElasticSearchEnable"/>
-            <magentoCLI command="cache:clean" arguments="full_page" stepKey="cleanCacheAfterElasticSearchEnable"/>
+            <comment userInput="BIC workaround" stepKey="reindexInvalidatedIndices"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindexAfterElasticSearchEnable">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheCleanActionGroup" stepKey="cleanCacheAfterElasticSearchEnable">
+                <argument name="tags" value="full_page"/>
+            </actionGroup>
         </before>
         <after>
             <!--Disable created test source.-->
@@ -68,8 +72,12 @@
             <deleteData createDataKey="simpleProduct2" stepKey="deleteProduct2"/>
             <deleteData createDataKey="simpleCategory" stepKey="deleteCategory"/>
 
-            <magentoCLI command="indexer:reindex" stepKey="performReindexAfterElasticSearchDisable"/>
-            <magentoCLI command="cache:flush" stepKey="cleanCacheAfterElasticSearchDisable"/>
+            <actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindexAfterElasticSearchDisable">
+                <argument name="indices" value=""/>
+            </actionGroup>
+            <actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCacheAfterElasticSearchDisable">
+                <argument name="tags" value=""/>
+            </actionGroup>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
         </after>
         <!--Quick search created product.-->