Skip to content

Commit 2fbeaa3

Browse files
okolesnykokolesnyk
authored
Merge pull request #414 from magento-gl/ACQE-5651-inventory-mainline
Acqe 5651 inventory mainline
2 parents 24b2253 + bb93b78 commit 2fbeaa3

5 files changed

+35
-30
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
<fillField selector="{{AdminProductGridFilterSection.skuFilter}}" userInput="{{productSku}}" stepKey="fillProduct1SkuFilter"/>
2727
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="clickApplyFilters"/>
2828
<waitForElementNotVisible selector="{{AdminProductGridSection.loadingMask}}" stepKey="waitForFilteredGridLoad" time="30"/>
29+
<scrollTo selector="{{AdminProductGridSection.qtyPerSourceInGrid('productSku')}}" stepKey="scrollToProduct1AssignedSourcesGrid"/>
30+
<waitForElementVisible selector="{{AdminProductGridSection.qtyPerSourceInGrid('productSku')}}" stepKey="waitForProduct1AssignedSourcesGridToBeinteractable"/>
2931
<moveMouseOver selector="{{AdminProductGridSection.qtyPerSourceInGrid('productSku')}}" stepKey="hoverOverProduct1AssignedSourcesGrid"/>
3032
<waitForElementVisible selector="{{AdminProductGridSection.qtyPerSourceOnHover(source1_name,'0')}}" stepKey="waitForElementVisiblePostHoverOnProduct1"/>
3133
<seeElement selector="{{AdminProductGridSection.qtyPerSourceOnHover(source1_name,'0')}}" stepKey="see0quantityForProduct1ForAssignedSources1"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<remove keyForRemoval="clickApplyFiltersButton"/>
2020
<remove keyForRemoval="clickOnFirstCheckbox"/>
2121
<remove keyForRemoval="enterAttributeQuantity"/>
22-
22+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
2323
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="waitForCreateConfigurationsClickable" after="clickCreateConfigurations"/>
2424
<click selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(attributeCode)}}" stepKey="clickOnFirstAttributeCheckbox" after="waitForCreateConfigurationsClickable"/>
2525
<waitForElementClickable selector="{{AdminCreateProductConfigurationsPanel.attributeCheckbox(secondAttributeCode)}}" stepKey="waitForFirstAttributeCheckboxClickable" after="clickOnFirstAttributeCheckbox"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<element name="textMassSourceAssignmentHeader" type="text" selector="//aside[@data-type='popup']//header[@class='modal-header']//h1[contains(text(),'{{var1}}')]" parameterized="true" />
3838
<element name="textMassSourceAssignmentBody" type="text" selector="//aside[@data-type='popup']//div[contains(text(),'{{var1}}')]" parameterized="true" />
3939
<element name="acceptOKPopup" type="button" selector="//aside[@data-type='popup']//button[@class='action-primary action-accept']" />
40-
<element name="qtyPerSourceInGrid" type="block" selector="//td//div[contains(text(),'{{var}}')]/../..//td[9]//div//li//strong[text()='Default Source']" parameterized="true" />
40+
<element name="qtyPerSourceInGrid" type="block" selector="//td//div[contains(text(),'{{var}}')]/ancestor::div//li//strong[text()='Default Source']" parameterized="true" />
4141
<element name="qtyPerSourceOnHover" type="block" selector="//div[contains(text(),'Quantity per Source:')]/..//strong[contains(text(),'{{var1}}')]/..//span[contains(text(),'{{var2}}')]" parameterized="true" />
4242
<element name="scalableQty" type="text" selector="//span[contains(@data-bind,'salableQuantityData().qty')]"/>
4343
<element name="btnAdvancedInventory" type="button" selector="//button//span[contains(text(),'Advanced Inventory')]"/>

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
</annotations>
2121
<before>
2222
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add static.magento.com example.com"/>
23-
<!--Create stock and source.-->
23+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindexAfterCLICommand">
24+
<argument name="indices" value=""/>
25+
</actionGroup>
26+
<!--Create stock and source.-->
2427
<createData entity="FullSource1" stepKey="source"/>
2528
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="stock"/>
2629
<createData entity="SourceStockLinked1" stepKey="sourceStockLink">

‎InventoryAdminUi/Test/Mftf/Test/AdminMassActionUnAssignAllProductSourcesFromSimpleProductTest.xml‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@
9393
<actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetFiltersOnProductGrid"/>
9494
<conditionalClick selector="{{AdminProductFiltersSection.filtersClear}}" dependentSelector="{{AdminProductFiltersSection.filtersClear}}" visible="true" stepKey="ClickOnButtonToRemoveFiltersIfPresent"/>
9595
<comment userInput="Check default source assigned to created products." stepKey="checkDefaultSourceAssignedToCreatedProductsComment"/>
96-
<see selector="{{AdminProductGridSection.productQtyPerSource('1', _defaultSource.name)}}" userInput="1000" stepKey="checkSourceQtyForFirstCreatedProduct"/>
97-
<see selector="{{AdminProductGridSection.productQtyPerSource('2', _defaultSource.name)}}" userInput="1000" stepKey="checkSourceQtyForSecondCreatedProduct"/>
98-
<see selector="{{AdminProductGridSection.productQtyPerSource('3', _defaultSource.name)}}" userInput="1000" stepKey="checkSourceQtyForThirdCreatedProduct"/>
99-
<see selector="{{AdminProductGridSection.productQtyPerSource('4', _defaultSource.name)}}" userInput="1000" stepKey="checkSourceQtyForFourthCreatedProduct"/>
96+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1', _defaultSource.name)}}" userInput="1000" stepKey="checkSourceQtyForFirstCreatedProduct"/>
97+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('2', _defaultSource.name)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProduct"/>
98+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('3', _defaultSource.name)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProduct"/>
99+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('4', _defaultSource.name)}}" userInput="1000" stepKey="checkSourceQtyForFourthCreatedProduct"/>
100100

101101
<comment userInput="Assign sources to all products" stepKey="assignSourcesToAllCreatedProductsComment"/>
102102
<click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdownForSelectAllProducts"/>
@@ -114,25 +114,25 @@
114114
<waitForPageLoad stepKey="waitForSourcesWillBeAssign"/>
115115

116116
<comment userInput="Check for all sources was assigned" stepKey="checkAllCreatedSourcesAssignedToProductsComment"/>
117-
<see selector="{{AdminProductGridSection.productQtyPerSource('1', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForFirstSource"/>
118-
<see selector="{{AdminProductGridSection.productQtyPerSource('1', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForSecondSource"/>
119-
<see selector="{{AdminProductGridSection.productQtyPerSource('1', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForThirdSource"/>
120-
<see selector="{{AdminProductGridSection.productQtyPerSource('1', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForFourthSource"/>
121-
122-
<see selector="{{AdminProductGridSection.productQtyPerSource('2', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForFirstSource"/>
123-
<see selector="{{AdminProductGridSection.productQtyPerSource('2', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForSecondSource"/>
124-
<see selector="{{AdminProductGridSection.productQtyPerSource('2', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForThirdSource"/>
125-
<see selector="{{AdminProductGridSection.productQtyPerSource('2', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForFourthSource"/>
126-
127-
<see selector="{{AdminProductGridSection.productQtyPerSource('3', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForFirstSource"/>
128-
<see selector="{{AdminProductGridSection.productQtyPerSource('3', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForSecondSource"/>
129-
<see selector="{{AdminProductGridSection.productQtyPerSource('3', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForThirdSource"/>
130-
<see selector="{{AdminProductGridSection.productQtyPerSource('3', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForFourthSource"/>
131-
132-
<see selector="{{AdminProductGridSection.productQtyPerSource('4', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForFirstSource"/>
133-
<see selector="{{AdminProductGridSection.productQtyPerSource('4', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForSecondSource"/>
134-
<see selector="{{AdminProductGridSection.productQtyPerSource('4', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForThirdSource"/>
135-
<see selector="{{AdminProductGridSection.productQtyPerSource('4', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForFourthSource"/>
117+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForFirstSource"/>
118+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForSecondSource"/>
119+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForThirdSource"/>
120+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForFourthSource"/>
121+
122+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('2', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForFirstSource"/>
123+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('2', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForSecondSource"/>
124+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('2', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForThirdSource"/>
125+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('2', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForSecondCreatedProductForFourthSource"/>
126+
127+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('3', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForFirstSource"/>
128+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('3', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForSecondSource"/>
129+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('3', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForThirdSource"/>
130+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('3', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForThirdCreatedProductForFourthSource"/>
131+
132+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('4', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForFirstSource"/>
133+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('4', $$createSecondCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForSecondSource"/>
134+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('4', $$createThirdCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForThirdSource"/>
135+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('4', $$createFourthCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFourthCreatedProductForFourthSource"/>
136136

137137
<comment userInput="Unassign all sources from all products" stepKey="unassignSourcesFromAllCreatedProductsComment"/>
138138
<click selector="{{AdminGridSelectRows.multicheckDropdown}}" stepKey="openMulticheckDropdownForSelectAllProductsForUnassignSources"/>
@@ -150,10 +150,10 @@
150150
<waitForPageLoad stepKey="waitForSourcesWillBeUnassign"/>
151151

152152
<comment userInput="Check if default source still assigned to created products." stepKey="checkDefaultSourceStillAssignedToCreatedProductsComment"/>
153-
<see selector="{{AdminProductGridSection.productQtyPerSource('1', _defaultSource.name)}}" userInput="1000" stepKey="checkDefaultSourceStillForFirstCreatedProduct"/>
154-
<see selector="{{AdminProductGridSection.productQtyPerSource('2', _defaultSource.name)}}" userInput="1000" stepKey="checkDefaultSourceStillForSecondCreatedProduct"/>
155-
<see selector="{{AdminProductGridSection.productQtyPerSource('3', _defaultSource.name)}}" userInput="1000" stepKey="checkDefaultSourceStillForThirdCreatedProduct"/>
156-
<see selector="{{AdminProductGridSection.productQtyPerSource('4', _defaultSource.name)}}" userInput="1000" stepKey="checkDefaultSourceStillForFourthCreatedProduct"/>
153+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('1', _defaultSource.name)}}" userInput="1000" stepKey="checkDefaultSourceStillForFirstCreatedProduct"/>
154+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('2', _defaultSource.name)}}" userInput="0" stepKey="checkDefaultSourceStillForSecondCreatedProduct"/>
155+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('3', _defaultSource.name)}}" userInput="0" stepKey="checkDefaultSourceStillForThirdCreatedProduct"/>
156+
<waitForText selector="{{AdminProductGridSection.productQtyPerSource('4', _defaultSource.name)}}" userInput="1000" stepKey="checkDefaultSourceStillForFourthCreatedProduct"/>
157157

158158
<comment userInput="Check for all sources was unassigned" stepKey="checkAllCreatedSourcesUnassignedFromProductsComment"/>
159159
<dontSee selector="{{AdminProductGridSection.productQtyPerSource('1', $$createFirstCustomSource.source[name]$$)}}" userInput="0" stepKey="checkSourceQtyForFirstCreatedProductForFirstSourceUnassined"/>

0 commit comments

Comments
 (0)