Skip to content

Commit a25bb34

Browse files
committed
MAGETWO-86243: Admin orders can result in a customer with an example email address
1 parent 1794af3 commit a25bb34

File tree

2 files changed

+9
-40
lines changed

2 files changed

+9
-40
lines changed

app/code/Magento/Catalog/Test/Mftf/ActionGroup/ProductsOnAdminActionGroup.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="clickOkInConfirmation"/>
2828
</actionGroup>
2929

30-
<actionGroup name="DeleteProductOnProductsGridPageByFilteredName">
30+
<actionGroup name="DeleteAllProductsOnProductsGridPageFilteredByName">
3131
<arguments>
3232
<argument name="product"/>
3333
</arguments>
@@ -37,7 +37,8 @@
3737
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters"/>
3838
<fillField selector="{{AdminProductGridFilterSection.name}}" userInput="{{product.name}}" stepKey="fillNameFieldInFilter"/>
3939
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="applyFilters"/>
40-
<click selector="{{AdminProductGridSection.firstRowCheckbox}}" stepKey="selectFirstFilteredProduct"/>
40+
<click selector="{{AdminProductGridSection.multicheckDropdown}}" stepKey="clickMulticheckDropDown"/>
41+
<click selector="{{AdminProductGridSection.multicheckOption('Select All')}}" stepKey="selectAllFilteredProducts"/>
4142
<click selector="{{AdminProductGridActionSection.actionsSelectBox}}" stepKey="openActionsSelectBox"/>
4243
<click selector="{{AdminProductGridActionSection.deleteOptionInActionsSelectBox}}" stepKey="clickDeleteAction"/>
4344
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/AdminCreateConfigurableProductTest.xml

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -20,57 +20,25 @@
2020
<group value="product"/>
2121
</annotations>
2222

23-
<!-- Login as admin -->
23+
<!-- Create Category And Login As Admin -->
2424
<before>
2525
<createData entity="_defaultCategory" stepKey="createCategory"/>
26+
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
2627
</before>
2728

2829
<!-- Delete Created Products And Category Then Logout -->
2930
<after>
30-
<!-- Before deleting first found product of 4 products that have the same name starting,
31-
delete 3 virtual products of them -->
32-
<actionGroup ref="DeleteProductOnProductsGridPageByFilteredName" stepKey="deleteVirtualProduct1">
33-
<argument name="product" value="colorProductAttribute1"/>
34-
</actionGroup>
35-
<actionGroup ref="DeleteProductOnProductsGridPageByFilteredName" stepKey="deleteVirtualProduct2">
36-
<argument name="product" value="colorProductAttribute2"/>
37-
</actionGroup>
38-
<actionGroup ref="DeleteProductOnProductsGridPageByFilteredName" stepKey="deleteVirtualProduct3">
39-
<argument name="product" value="colorProductAttribute3"/>
40-
</actionGroup>
41-
42-
<!-- Delete actually configurable product -->
43-
<actionGroup ref="DeleteProductOnProductsGridPageByName" stepKey="deleteCreatedProducts">
31+
<!-- Delete all created products (including virtual) -->
32+
<actionGroup ref="DeleteAllProductsOnProductsGridPageFilteredByName" stepKey="deleteCreatedProductAttribute">
4433
<argument name="product" value="_defaultProduct"/>
4534
</actionGroup>
46-
47-
<!-- Tryna delete category via API -->
48-
<!--actionGroup ref="DeleteCategory" stepKey="deleteCreatedCategory">
49-
<argument name="categoryEntity" value="_defaultCategory"/>
50-
</actionGroup-->
51-
52-
<!-- Delete created product attribute -->
53-
<actionGroup ref="DeleteProductAttribute" stepKey="deleteCreatedProductAttribute">
54-
<argument name="productAttribute" value="colorProductAttribute"/>
55-
</actionGroup>
56-
35+
<!-- Logout -->
5736
<actionGroup ref="logout" stepKey="logout"/>
58-
37+
<!-- Delete created category -->
5938
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
6039
</after>
6140

62-
<!-- Tryna create category via API -->
63-
<!--amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryGridPage"/>
64-
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
65-
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
66-
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="enterCategoryName"/>
67-
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSeoSection"/>
68-
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterUrlKey"/>
69-
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickOnSaveCategory"/>
70-
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/-->
71-
7241
<!-- Create configurable product... -->
73-
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
7442
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
7543
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
7644
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>

0 commit comments

Comments
 (0)