Skip to content

Commit adfc40b

Browse files
Merge pull request #655 from magento-gl/ACQE-functional-deployment-v4-6
Bengals Functional Mainline deployment PR
2 parents 2b9fa73 + 6087f0f commit adfc40b

4 files changed

+7
-10
lines changed

InventoryAdminUi/Test/Mftf/Test/AdminAssignSimpleProductToAdditionalStockAdditionalWebsiteTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
<argument name="stockName" value="{{_defaultStock.name}}"/>
6767
<argument name="websiteName" value="{{_defaultWebsite.name}}"/>
6868
</actionGroup>
69+
<!--Delete customers generated through other action groups -->
70+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomers"/>
6971
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
7072
<!--Delete category, product and stock. Revert configuration.-->
7173
<magentoCLI command="config:set {{StorefrontDisableAddStoreCodeToUrls.path}} {{StorefrontDisableAddStoreCodeToUrls.value}}" stepKey="addStoreCodeToUrlDisable"/>

InventoryAdminUi/Test/Mftf/Test/AdminCreateFullInvoiceForOrderWithDownloadableProductOnCustomStockTest.xml

Lines changed: 2 additions & 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
<magentoCLI stepKey="addDownloadableDomain" command="downloadable:domains:add example.com static.magento.com" before="category"/>
@@ -59,12 +58,13 @@
5958
</actionGroup>
6059
<deleteData createDataKey="stock" stepKey="deleteStock"/>
6160
<actionGroup ref="DisableAllSourcesActionGroup" stepKey="disableAllSources"/>
61+
<!--Delete customers generated through other action groups -->
62+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomers"/>
6263
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
6364
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
6465
<argument name="indices" value=""/>
6566
</actionGroup>
6667
</after>
67-
6868
<!--- Place order and create invoice. -->
6969
<actionGroup ref="AdminNavigateToNewOrderPageNewCustomerActionGroup" stepKey="createNewOrderForCustomer"/>
7070
<waitForPageLoad stepKey="waitForPageLoad"/>

InventoryAdminUi/Test/Mftf/Test/AdminUserCreateOrderFromTestWebsiteWithSimpleProductWithInventoryOnDefaultAndTestStockTest.xml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<group value="multi_mode"/>
2020
<group value="pr_exclude"/>
2121
</annotations>
22-
2322
<before>
2423
<createData entity="FullSource1" stepKey="createSource1"/>
2524
<createData entity="BasicMsiStockWithMainWebsite1" stepKey="createStock1"/>
@@ -29,7 +28,6 @@
2928
</createData>
3029
<createData entity="SimpleSubCategory" stepKey="createCategory1"/>
3130
<createData entity="SimpleMsiProduct" stepKey="createProduct1"/>
32-
3331
<actionGroup ref="AdminLoginActionGroup" stepKey="loginToAdmin1"/>
3432
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
3533
<!--Create new website,store and store view-->
@@ -80,6 +78,8 @@
8078
<actionGroup ref="DisableSourceActionGroup" stepKey="disableCreatedSource">
8179
<argument name="sourceCode" value="$$createSource1.source[source_code]$$"/>
8280
</actionGroup>
81+
<!--Delete customers generated through other action groups -->
82+
<actionGroup ref="AdminDeleteAllCustomerActionGroup" stepKey="deleteAllCustomers"/>
8383
<deleteData createDataKey="createProduct1" stepKey="deleteProduct"/>
8484
<deleteData createDataKey="createCategory1" stepKey="deleteCategory"/>
8585
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
@@ -103,7 +103,6 @@
103103
</actionGroup>
104104
<fillField selector="{{AdminProductSourcesGrid.rowQty('1')}}" userInput="10" stepKey="fillSourceQuantityField"/>
105105
<actionGroup ref="AdminFormSaveAndCloseActionGroup" stepKey="saveAndCloseFourthProductForm"/>
106-
107106
<comment userInput="Create order with simple product from admin area."
108107
stepKey="createOrderWithGroupedProductComment"/>
109108
<amOnPage url="{{AdminOrdersPage.url}}" stepKey="goToOrdersPage1"/>
@@ -124,16 +123,13 @@
124123
<scrollToTopOfPage stepKey="scrollToTop"/>
125124
<click selector="#add_products" stepKey="clickOnAddProductsButton1"/>
126125
<waitForPageLoad time="30" stepKey="waitForPageLoad15"/>
127-
128126
<fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{SimpleMsiProduct.sku}}"
129127
stepKey="fillProductSkuField1"/>
130128
<waitForPageLoad time="10" stepKey="waitForPageLoad16"/>
131129
<click selector="#order-search button[title='Search']" stepKey="clickOnSearch2"/>
132130
<waitForPageLoad time="10" stepKey="waitForPageLoad17"/>
133-
134131
<click selector="#order-search tbody tr .col-sku" stepKey="clickOnSku1"/>
135132
<waitForPageLoad time="10" stepKey="waitForPageLoad18"/>
136-
137133
<fillField selector="#order-search tr .qty" userInput="5" stepKey="fillProductQuantity2"/>
138134
<click selector="#order-search .action-add" stepKey="clickOnAddSelectedProductsToOrder1"/>
139135
<waitForPageLoad time="10" stepKey="waitForPageLoad19"/>
@@ -144,14 +140,12 @@
144140
<waitForPageLoad time="10" stepKey="waitForPageLoad22"/>
145141
<click selector=".order-totals-actions .save" stepKey="clickOnSubmitOrder1"/>
146142
<waitForPageLoad time="30" stepKey="waitForPageLoad23"/>
147-
148143
<seeElement selector="{{AdminOrderDetailsMessagesSection.successMessage}}" stepKey="seeSuccessMessage1"/>
149144
<see selector="{{AdminOrderDetailsMessagesSection.successMessage}}" userInput="You created the order."
150145
stepKey="seeSuccessMessage2"/>
151146
<grabTextFrom selector=".page-title" stepKey="grabTheOrderId1"/>
152147
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="navigateToProductIndex2"/>
153148
<waitForPageLoad time="30" stepKey="waitForPageLoad26"/>
154-
155149
<actionGroup ref="AdminGridFilterSearchResultsByInput" stepKey="filterSearchResults3">
156150
<argument name="selector" value="AdminProductGridFilterSection.skuFilter"/>
157151
<argument name="value" value="{{SimpleMsiProduct.sku}}"/>

InventoryCatalogSearchBundleProduct/Test/Mftf/Test/StorefrontBundleProductNotVisibleAfterDisablingChildProductsTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
<deleteData createDataKey="createBundleProduct" stepKey="deleteBundleProduct"/>
9090
<deleteData createDataKey="createFirstSimpleProduct" stepKey="deleteFirstChildProduct"/>
9191
<deleteData createDataKey="createSecondSimpleProduct" stepKey="deleteSecondChildProduct"/>
92+
<deleteData createDataKey="customer" stepKey="deleteCustomer"/>
9293
<!-- Assign Default Stock to Main Website -->
9394
<actionGroup ref="AssignWebsiteToStockActionGroup" stepKey="assignMainWebsiteToDefaultStock">
9495
<argument name="stockName" value="{{_defaultStock.name}}"/>

0 commit comments

Comments
 (0)