Skip to content

Commit 141fd64

Browse files
author
magento packaging service
committed
Version 1.2.6-p12
1 parent 5726b2e commit 141fd64

File tree

530 files changed

+3242
-1428
lines changed

Some content is hidden

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

530 files changed

+3242
-1428
lines changed

‎Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithTestSourceTest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,16 @@
7878
<see userInput="$$virtualProduct1.product[sku]$$" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku1"/>
7979

8080
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 99" stepKey="setMinQtyToDefaultValue1"/>
81-
<magentoCLI command="indexer:reindex" stepKey="reindex1"/>
81+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
82+
<argument name="indices" value=""/>
83+
</actionGroup>
8284
<magentoCLI command="cache:flush" stepKey="flushCache1"/>
8385

8486
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
8587
<argument name="Customer" value="$$customer$$"/>
8688
</actionGroup>
8789

88-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
90+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
8991
<argument name="customer" value="$$customer$$"/>
9092
</actionGroup>
9193

‎Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftTresholdForVirtualProductWithDefaultSourceTest.xml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,9 @@
3535
</createData>
3636

3737
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 0" stepKey="setMinQtyToDefaultValue1"/>
38-
<magentoCLI command="indexer:reindex" stepKey="reindex1"/>
38+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
39+
<argument name="indices" value=""/>
40+
</actionGroup>
3941
<magentoCLI command="cache:flush" stepKey="flushCache1"/>
4042

4143
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
@@ -52,7 +54,9 @@
5254
<click selector="{{AdminGridMainControls.saveAndContinue}}" stepKey="saveDefaultStock"/>
5355

5456
<comment userInput="Perform reindex and cache flush after assign default stock to main website." stepKey="reindexCacheFlushAfterAssignDefaultStockToMainWebsite"/>
55-
<magentoCLI command="indexer:reindex" stepKey="performReindex"/>
57+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindex">
58+
<argument name="indices" value=""/>
59+
</actionGroup>
5660
<magentoCLI command="cache:flush" stepKey="cleanCache"/>
5761
</before>
5862
<after>
@@ -80,14 +84,16 @@
8084
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndClose1"/>
8185

8286
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 5" stepKey="setMinQtyToDefaultValue1"/>
83-
<magentoCLI command="indexer:reindex" stepKey="reindex1"/>
87+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
88+
<argument name="indices" value=""/>
89+
</actionGroup>
8490
<magentoCLI command="cache:flush" stepKey="flushCache1"/>
8591

8692
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
8793
<argument name="Customer" value="$$customer$$"/>
8894
</actionGroup>
8995

90-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
96+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
9197
<argument name="customer" value="$$customer$$"/>
9298
</actionGroup>
9399

‎Inventory/Test/Mftf/Test/AdminCreateVirtualProductWithDefaultSourceTest.xml‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@
2828
<actionGroup ref="AdminAssignCategoryToProductAndSaveActionGroup" stepKey="assignCategoryToProduct">
2929
<argument name="categoryName" value="$category.name$"/>
3030
</actionGroup>
31-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
31+
<comment userInput="BIC workaround" stepKey="reindex"/>
32+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
33+
<argument name="indices" value=""/>
34+
</actionGroup>
3235
<magentoCLI command="cache:flush" stepKey="flushCache"/>
3336
</before>
3437
<after>
@@ -37,7 +40,9 @@
3740
<deleteData createDataKey="product" stepKey="deleteProduct"/>
3841
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
3942
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
40-
<magentoCron groups="index" stepKey="reindex"/>
43+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
44+
<argument name="indices" value=""/>
45+
</actionGroup>
4146
</after>
4247

4348
<!--Verify product on category page.-->

‎Inventory/Test/Mftf/Test/AdminOutOfStockThresholdOnVirtualProductPageTest.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveVirtualProduct1"/>
5555

56-
<actionGroup ref="NavigateToNewOrderPageExistingCustomerActionGroup" stepKey="newOrderExistingCustomer1">
56+
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="newOrderExistingCustomer1">
5757
<argument name="customer" value="Simple_US_Customer"/>
5858
</actionGroup>
5959

@@ -70,7 +70,9 @@
7070
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
7171
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
7272

73-
<magentoCLI command="indexer:reindex" stepKey="runIndexerReindex2"/>
73+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexerReindex2">
74+
<argument name="indices" value=""/>
75+
</actionGroup>
7476
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterDisableManageStock2"/>
7577

7678
<amOnPage url="/$$createProduct1.product[sku]$$.html" stepKey="amOnProductPage2"/>

‎Inventory/Test/Mftf/Test/AdminVirtualProductDisabledManageStockOnCustomStockTest.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,9 @@
3636
<requiredEntity createDataKey="customStock"/>
3737
<requiredEntity createDataKey="customSource1"/>
3838
</createData>
39-
<magentoCLI command="indexer:reindex" stepKey="reindex"/>
39+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
40+
<argument name="indices" value=""/>
41+
</actionGroup>
4042
<magentoCLI command="cache:flush" stepKey="flushCache"/>
4143
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
4244
</before>
@@ -96,7 +98,9 @@
9698
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveVirtualProduct2"/>
9799

98100
<magentoCLI command="config:set {{TurnOffManageStockConfig.path}} {{TurnOffManageStockConfig.value}}" stepKey="magentoCLI1"/>
99-
<magentoCLI command="indexer:reindex" stepKey="performReindexAfterDisableManageStock"/>
101+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="performReindexAfterDisableManageStock">
102+
<argument name="indices" value=""/>
103+
</actionGroup>
100104
<magentoCLI command="cache:flush" stepKey="cleanCacheAfterDisableManageStock"/>
101105

102106
<actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="checkConfigurableIsPresentOnCategoryPage2">

‎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": "~8.1.0||~8.2.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.4-p4",
10+
"require": {
11+
"php": "~8.1.0||~8.2.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: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,25 @@
2020
<remove keyForRemoval="clickOnFirstCheckbox"/>
2121
<remove keyForRemoval="enterAttributeQuantity"/>
2222

23-
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="clickCreateConfigurations"/>
24-
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="clickOnFirstAttributeCheckbox"/>
23+
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="waitForCreateConfigurationsClickable" after="clickCreateConfigurations"/>
24+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="waitForCreateConfigurationsClickable"/>
25+
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="waitForFirstAttributeCheckboxClickable" after="clickOnFirstAttributeCheckbox"/>
26+
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="clickOnSecondAttributeCheckbox" after="waitForFirstAttributeCheckboxClickable"/>
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+
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="waitForSelectAllForFirstAttributeClickable" after="clickOnNextButton1"/>
31+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabFirstAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForFirstAttribute" after="waitForSelectAllForFirstAttributeClickable"/>
32+
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="waitForSecondAttributeCheckboxClickable" after="clickOnSelectAllForFirstAttribute"/>
33+
<click selector="{{AdminCreateProductConfigurationsPanel.selectAllByAttribute({$grabSecondAttributeDefaultLabel})}}" stepKey="clickOnSelectAllForSecondAttribute" after="waitForSecondAttributeCheckboxClickable"/>
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+
<waitForElementClickable selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="waitForCustomSourceClickable" after="clickKeywordSearch"/>
41+
<click selector="{{AdminGridRow.checkboxByValue(sourceName)}}" stepKey="selectCustomSource" after="waitForCustomSourceClickable"/>
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/AdminDeleteStockActionGroup.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<argument name="websiteName" defaultValue="Main Website" type="string"/>
1717
</arguments>
1818
<amOnPage url="{{AdminStockPage.url}}" stepKey="navigateToManageStockPage"/>
19+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
1920
<fillField selector="{{AdminManageStockGridBody.searchStockText}}" userInput="{{stockName}}" stepKey="enterStockName" />
2021
<click selector="{{AdminManageStockGridBody.clickSearchStock}}" stepKey="clickSearchStockButton" />
2122
<waitForPageLoad stepKey="waitForStoreGroupPageLoad" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<argument name="sourceName22"/>
3939
</arguments>
4040
<amOnPage url="{{AdminStockPage.url}}" stepKey="navigateToManageStockPage"/>
41+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
4142
<fillField selector="{{AdminManageStockGridBody.searchStockText}}" userInput="{{stockName}}" stepKey="enterStockName" />
4243
<click selector="{{AdminManageStockGridBody.clickSearchStock}}" stepKey="clickSearchStockButton" />
4344
<waitForPageLoad stepKey="waitForStoreGroupPageLoad" />

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<argument name="sourceName2"/>
1919
</arguments>
2020
<amOnPage url="{{AdminStockPage.url}}" stepKey="navigateToManageStockPage"/>
21+
<conditionalClick selector="{{AdminProductGridFilterSection.clearFilters}}" dependentSelector="{{AdminProductGridFilterSection.clearFilters}}" visible="true" stepKey="clickClearFilters"/>
2122
<fillField selector="{{AdminManageStockGridBody.searchStockText}}" userInput="{{stockName}}" stepKey="enterStockName" />
2223
<click selector="{{AdminManageStockGridBody.clickSearchStock}}" stepKey="clickSearchStockButton" />
2324
<waitForPageLoad stepKey="waitForStoreGroupPageLoad" />

0 commit comments

Comments
 (0)