Skip to content

Commit 1fcfe33

Browse files
engcom-Hotelengcom-Hotel
authored
Merge branch 'develop' into patch-1
2 parents 870ccb7 + 37c8bc5 commit 1fcfe33

File tree

94 files changed

+1808
-1467
lines changed

Some content is hidden

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

94 files changed

+1808
-1467
lines changed

‎.github/.metadata.json‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎Inventory/Test/Mftf/Test/AdminCanSetOnlyXLeftThresholdForVirtualProductWithDefaultSourceTest.xml‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,32 +18,26 @@
1818
<group value="msi"/>
1919
<group value="multi_mode"/>
2020
</annotations>
21-
2221
<before>
2322
<createData entity="Msi_US_Customer" stepKey="customer"/>
24-
2523
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
2624
<createData entity="VirtualMsiProduct" stepKey="virtualProduct1">
2725
<requiredEntity createDataKey="createCategory1"/>
2826
</createData>
29-
3027
<createData entity="FullSource1" stepKey="createSource1"/>
3128
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock1"/>
3229
<createData entity="SourceStockLinked1" stepKey="linkSourceStock1">
3330
<requiredEntity createDataKey="createStock1"/>
3431
<requiredEntity createDataKey="createSource1"/>
3532
</createData>
36-
3733
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 0" stepKey="setMinQtyToDefaultValue1"/>
3834
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
3935
<argument name="indices" value=""/>
4036
</actionGroup>
4137
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache1">
4238
<argument name="tags" value=""/>
4339
</actionGroup>
44-
4540
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
46-
4741
<comment userInput="Assign Default Stock to Main Website " stepKey="assignDefaultStockToMainWebsiteComment"/>
4842
<amOnPage url="{{AdminManageStockPage.url}}" stepKey="navigateToStockListPage"/>
4943
<waitForPageLoad time="30" stepKey="waitForStockListPageLoad"/>
@@ -71,64 +65,50 @@
7165
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
7266
</actionGroup>
7367
<deleteData createDataKey="createCategory1" stepKey="deletecreateCategory1"/>
68+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
7469
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
7570
</after>
76-
7771
<actionGroup ref="AdminGoToProductGridFilterResultsByInputEditProduct" stepKey="goToProductGridFilterResultsByInputEditProduct1">
7872
<argument name="filter_selector" value="AdminProductGridFilterSection.skuFilter"/>
7973
<argument name="filter_value" value="$$virtualProduct1.product[sku]$$"/>
8074
</actionGroup>
81-
8275
<selectOption selector="{{AdminProductSourcesGrid.rowStatus('0')}}" userInput="In Stock" stepKey="selectStockStatus" />
8376
<fillField selector="{{AdminProductSourcesGrid.rowQty('0')}}" userInput="10" stepKey="fillSourceQuantityField1"/>
84-
8577
<scrollToTopOfPage stepKey="scrollToTopOfPage1"/>
8678
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}"
8779
parameterArray="[$$createCategory1.name$$]" requiredAction="true"
8880
stepKey="searchAndSelectCategory"/>
89-
9081
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndClose1"/>
91-
9282
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 5" stepKey="setMinQtyToDefaultValue1"/>
9383
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
9484
<argument name="indices" value=""/>
9585
</actionGroup>
9686
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache1">
9787
<argument name="tags" value=""/>
9888
</actionGroup>
99-
10089
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
10190
<argument name="Customer" value="$$customer$$"/>
10291
</actionGroup>
103-
10492
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
10593
<argument name="customer" value="$$customer$$"/>
10694
</actionGroup>
107-
10895
<waitForPageLoad stepKey="waitForPageLoad1"/>
109-
11096
<conditionalClick selector="#store_1" dependentSelector="#order-store-selector" visible="true" stepKey="clickOnDefaultStoreViewIfPresent1"/>
11197
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
112-
11398
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addVirtualProductToOrder">
11499
<argument name="product" value="$$virtualProduct1$$"/>
115100
</actionGroup>
116-
117101
<fillField selector=".item-qty" userInput="5" stepKey="fillQtyField1"/>
118102
<click selector=".order-discounts button[title='Update Items and Quantities']" stepKey="clickOnUpdateItems1"/>
119103
<waitForPageLoad stepKey="waitForPageLoad3"/>
120-
121104
<comment userInput="Submit order." stepKey="submitOrderComment"/>
122105
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
123106
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
124-
125107
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache2">
126108
<argument name="tags" value=""/>
127109
</actionGroup>
128-
129110
<amOnPage url="/$$virtualProduct1.product[sku]$$.html" stepKey="amOnProductPage2"/>
130111
<waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
131-
132112
<see selector=".availability.only" userInput="Only 5 left" stepKey="seeCurrentProductQuantity1"/>
133113
</test>
134114
</tests>

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -18,24 +18,19 @@
1818
<group value="msi"/>
1919
<group value="multi_mode"/>
2020
</annotations>
21-
2221
<before>
2322
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 0" stepKey="setMinQtyToDefaultValue1"/>
24-
2523
<createData entity="Msi_US_Customer" stepKey="customer"/>
26-
2724
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
2825
<createData entity="VirtualMsiProduct" stepKey="virtualProduct1">
2926
<requiredEntity createDataKey="createCategory1"/>
3027
</createData>
31-
3228
<createData entity="FullSource1" stepKey="createSource1"/>
3329
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock1"/>
3430
<createData entity="SourceStockLinked1" stepKey="linkSourceStock1">
3531
<requiredEntity createDataKey="createStock1"/>
3632
<requiredEntity createDataKey="createSource1"/>
3733
</createData>
38-
3934
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
4035
</before>
4136
<after>
@@ -46,69 +41,56 @@
4641
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
4742
</actionGroup>
4843
<deleteData createDataKey="createCategory1" stepKey="deletecreateCategory1"/>
44+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
4945
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
5046
</after>
51-
5247
<actionGroup ref="AdminGoToProductGridFilterResultsByInputEditProduct" stepKey="goToProductGridFilterResultsByInputEditProduct1">
5348
<argument name="filter_selector" value="AdminProductGridFilterSection.skuFilter"/>
5449
<argument name="filter_value" value="$$virtualProduct1.product[sku]$$"/>
5550
</actionGroup>
56-
5751
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}"
5852
parameterArray="[$$createCategory1.name$$]" requiredAction="true"
5953
stepKey="searchAndSelectCategory"/>
60-
6154
<actionGroup ref="AdminOnProductEditPageAssignSourceToProduct" stepKey="AdminOnProductEditPageAssignSourceToProduct1">
6255
<argument name="filter_selector" value="AdminManageSourcesGridFilterControls.code"/>
6356
<argument name="filter_value" value="$$createSource1.source[source_code]$$"/>
6457
</actionGroup>
65-
6658
<fillField selector="{{AdminProductSourcesGrid.rowQty('0')}}" userInput="100" stepKey="fillSourceQuantityField1"/>
6759
<fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="100" stepKey="fillSourceQuantityField2"/>
6860
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndClose1"/>
69-
7061
<actionGroup ref="AssertProductInStorefrontCategoryPage" stepKey="assertProductInStorefront1">
7162
<argument name="category" value="$$createCategory1$$"/>
7263
<argument name="product" value="VirtualMsiProduct"/>
7364
</actionGroup>
74-
7565
<amOnPage url="/$$virtualProduct1.product[sku]$$.html" stepKey="amOnProductPage1"/>
7666
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
7767
<seeInTitle userInput="$$virtualProduct1.product[name]$$" stepKey="assertProductNameTitle1"/>
7868
<see userInput="$$virtualProduct1.product[name]$$" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName1"/>
7969
<see userInput="$$virtualProduct1.product[price]$$" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice1"/>
8070
<see userInput="$$virtualProduct1.product[sku]$$" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku1"/>
81-
8271
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 99" stepKey="setMinQtyToDefaultValue1"/>
8372
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex1">
8473
<argument name="indices" value=""/>
8574
</actionGroup>
8675
<actionGroup ref="CliCacheFlushActionGroup" stepKey="flushCache1">
8776
<argument name="tags" value=""/>
8877
</actionGroup>
89-
9078
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefront">
9179
<argument name="Customer" value="$$customer$$"/>
9280
</actionGroup>
93-
9481
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="createNewOrderForCustomer">
9582
<argument name="customer" value="$$customer$$"/>
9683
</actionGroup>
97-
9884
<conditionalClick selector="#store_1" dependentSelector="#order-store-selector" visible="true" stepKey="clickOnDefaultStoreViewIfPresent1"/>
9985
<waitForPageLoad time="30" stepKey="waitForPageLoad14"/>
100-
10186
<actionGroup ref="AddSimpleProductToOrderActionGroup" stepKey="addVirtualProductToOrder">
10287
<argument name="product" value="$$virtualProduct1$$"/>
10388
</actionGroup>
104-
10589
<comment userInput="Submit order." stepKey="submitOrderComment"/>
10690
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
10791
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
108-
10992
<amOnPage url="/$$virtualProduct1.product[sku]$$.html" stepKey="amOnProductPage2"/>
11093
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
111-
11294
<see selector=".availability.only" userInput="Only 99 left" stepKey="seeCurrentProductQuantity1"/>
11395
</test>
11496
</tests>

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,44 +19,35 @@
1919
<group value="single_mode"/>
2020
<group value="pr_exclude"/>
2121
</annotations>
22-
2322
<before>
2423
<magentoCLI command="config:set {{TurnOnManageStockConfig.path}} {{TurnOnManageStockConfig.value}}" stepKey="magentoCLI1"/>
2524
<magentoCLI command="config:set cataloginventory/options/stock_threshold_qty 5" stepKey="setThreshold1"/>
26-
2725
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
2826
<createData entity="VirtualMsiProduct" stepKey="createProduct1"/>
2927
<createData entity="Simple_US_Customer" stepKey="createCustomer1"/>
30-
3128
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin1"/>
3229
</before>
3330
<after>
3431
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin1"/>
35-
3632
<deleteData createDataKey="createProduct1" stepKey="deleteProduct1"/>
3733
<deleteData createDataKey="createCategory1" stepKey="deleteCategory1"/>
34+
<deleteData createDataKey="createCustomer1" stepKey="deleteCustomer"/>
3835
</after>
39-
4036
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="goToProductGridPage1"/>
4137
<actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterSearchResultsForSimpleProduct1">
4238
<argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
4339
<argument name="value" value="$$createProduct1.product[sku]$$"/>
4440
</actionGroup>
4541
<click selector="{{AdminGridRow.editByValue($$createProduct1.product[sku]$$)}}" stepKey="editProduct1"/>
4642
<waitForPageLoad time="30" stepKey="waitForCustomSourceEditPageLoad1"/>
47-
4843
<fillField selector="{{AdminProductFormSection.productQuantity}}" userInput="10" stepKey="fillProductQuantity"/>
4944
<waitForPageLoad time="30" stepKey="waitForCustomSourceEditPageLoad2"/>
5045
<selectOption selector="{{AdminProductFormSection.productStockStatus}}" userInput="In Stock" stepKey="selectStockStatus"/>
51-
5246
<searchAndMultiSelectOption selector="{{AdminProductFormSection.categoriesDropdown}}" parameterArray="[$$createCategory1.name$$]" stepKey="searchAndSelectCategory1"/>
53-
5447
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="saveVirtualProduct1"/>
55-
5648
<actionGroup ref="AdminNavigateToNewOrderPageExistingCustomerActionGroup" stepKey="newOrderExistingCustomer1">
5749
<argument name="customer" value="Simple_US_Customer"/>
5850
</actionGroup>
59-
6051
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
6152
<fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="$$createProduct1.product[sku]$$" stepKey="fillSkuFilter"/>
6253
<click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearch"/>
@@ -65,21 +56,17 @@
6556
<fillField selector="{{AdminOrderFormItemsSection.rowQty('1')}}" userInput="5" stepKey="fillProductQty"/>
6657
<scrollTo selector="{{AdminOrderFormItemsSection.addSelected}}" x="0" y="-100" stepKey="scrollToAddSelectedButton"/>
6758
<click selector="{{AdminOrderFormItemsSection.addSelected}}" stepKey="clickAddSelectedProducts"/>
68-
6959
<click selector="{{AdminOrderFormActionSection.SubmitOrder}}" stepKey="clickSubmitOrder"/>
7060
<seeInCurrentUrl url="{{AdminOrderDetailsPage.url}}" stepKey="seeViewOrderPage"/>
7161
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order." stepKey="seeSuccessMessage"/>
72-
7362
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="runIndexerReindex2">
7463
<argument name="indices" value=""/>
7564
</actionGroup>
7665
<actionGroup ref="CliCacheFlushActionGroup" stepKey="cleanCacheAfterDisableManageStock2">
7766
<argument name="tags" value=""/>
7867
</actionGroup>
79-
8068
<amOnPage url="/$$createProduct1.product[sku]$$.html" stepKey="amOnProductPage2"/>
8169
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
82-
8370
<see selector=".availability.only" userInput="Only 5 left" stepKey="seeCurrentProductQuantity1"/>
8471
</test>
8572
</tests>

‎InventoryAdminUi/Test/Mftf/Test/AddProductToCartAfterCancelOrderConfigurableProductCustomStockTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<group value="msi"/>
1919
<group value="multi_mode"/>
2020
</annotations>
21-
2221
<before>
2322
<!--Create test data.-->
2423
<createData entity="SimpleSubCategory" stepKey="category"/>
@@ -70,6 +69,7 @@
7069
<deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
7170
<deleteData createDataKey="configurableChildProduct" stepKey="deleteConfigurableProductVariation"/>
7271
<deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
72+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
7373
<!--Assign Default Stock to Main Website.-->
7474
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
7575
<argument name="stockName" value="{{_defaultStock.name}}"/>
@@ -86,7 +86,6 @@
8686
<deleteData createDataKey="category" stepKey="deletecategory"/>
8787
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdminArea"/>
8888
</after>
89-
9089
<!--Add configurable product to cart.-->
9190
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
9291
<argument name="Customer" value="$customer$" />

‎InventoryAdminUi/Test/Mftf/Test/AdminCacheValidationConfigurableProductSoldOutCustomStocksTest.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@
4545
<argument name="sourceCode" value="$$additionalSourceMainWebsite.source[source_code]$$"/>
4646
</actionGroup>
4747
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
48-
<!--Delete category and stock.-->
48+
<!--Delete category, product and stock.-->
49+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
4950
<deleteData createDataKey="category" stepKey="deleteCategory"/>
5051
<deleteData createDataKey="additionalStockMainWebsite" stepKey="deleteMainWebsiteStock"/>
5152
<!-- Delete all products via API -->

‎InventoryAdminUi/Test/Mftf/Test/AdminCancelOrderConfigurableProductWithDropDownAttributeAndCustomSourceTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
<group value="msi"/>
1919
<group value="multi_mode"/>
2020
</annotations>
21-
2221
<before>
2322
<!--Create test data.-->
2423
<createData entity="SimpleSubCategory" stepKey="category"/>
@@ -70,6 +69,7 @@
7069
<deleteData createDataKey="configurableProduct" stepKey="deleteConfigurableProduct"/>
7170
<deleteData createDataKey="configurableChildProduct" stepKey="deleteConfigurableProductVariation"/>
7271
<deleteData createDataKey="configurableProductAttribute" stepKey="deleteConfigurableProductAttribute"/>
72+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
7373
<!--Assign Default Stock to Main Website.-->
7474
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
7575
<argument name="stockName" value="{{_defaultStock.name}}"/>
@@ -88,7 +88,6 @@
8888
<argument name="indices" value=""/>
8989
</actionGroup>
9090
</after>
91-
9291
<!--Add configurable product to cart.-->
9392
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginAsCustomer">
9493
<argument name="Customer" value="$customer$" />

‎InventoryAdminUi/Test/Mftf/Test/AdminCreateCreditMemoAfterFullInvoiceFullShipmentBundleProductCustomStockCustomWebsiteTest.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<group value="msi"/>
1818
<group value="multi_mode"/>
1919
</annotations>
20-
2120
<before>
2221
<!--Create test data.-->
2322
<createData entity="FlatRateShippingMethodDefault" stepKey="setDefaultFlatRateShippingMethod"/>
@@ -112,12 +111,12 @@
112111
<argument name="websiteName" value="{{customWebsite.name}}"/>
113112
</actionGroup>
114113
<deleteData createDataKey="stock" stepKey="deleteStock"/>
114+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomers"/>
115115
<actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
116116
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
117117
<argument name="indices" value=""/>
118118
</actionGroup>
119119
</after>
120-
121120
<!--Get bundle product option.-->
122121
<amOnPage url="{{AdminProductEditPage.url($bundleProduct.id$)}}" stepKey="openBundleProductEditPage"/>
123122
<grabTextFrom selector="{{AdminProductFormBundleSection.currentBundleOption}}" stepKey="grabBundleOption"/>

0 commit comments

Comments
 (0)