Skip to content

Commit fb82e26

Browse files
zakdmazakdma
committed
MAGETWO-86243: Admin orders can result in a customer with an example email address
1 parent c235dcf commit fb82e26

File tree

4 files changed

+63
-3
lines changed

4 files changed

+63
-3
lines changed

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,28 @@
1919
</arguments>
2020
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductsGridPage"/>
2121
<waitForPageLoad stepKey="waitForPageLoad"/>
22+
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters"/>
2223
<click selector="{{AdminProductGridSection.checkbox(product.name)}}" stepKey="tickCheckbox"/>
2324
<click selector="{{AdminProductGridActionSection.actionsSelectBox}}" stepKey="openActionsSelectBox"/>
2425
<click selector="{{AdminProductGridActionSection.deleteOptionInActionsSelectBox}}" stepKey="clickDeleteAction"/>
2526
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
2627
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="clickOkInConfirmation"/>
2728
</actionGroup>
29+
30+
<actionGroup name="DeleteProductOnProductsGridPageByFilteredName">
31+
<arguments>
32+
<argument name="product"/>
33+
</arguments>
34+
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="openProductsGridPage"/>
35+
<waitForPageLoad stepKey="waitForPageLoad"/>
36+
<click selector="{{AdminProductGridFilterSection.filters}}" stepKey="clickOnFiltersButton"/>
37+
<conditionalClick selector="{{AdminProductGridFilterSection.clearAll}}" dependentSelector="{{AdminProductGridFilterSection.clearAll}}" visible="true" stepKey="clearFilters"/>
38+
<fillField selector="{{AdminProductGridFilterSection.name}}" userInput="{{product.name}}" stepKey="fillNameFieldInFilter"/>
39+
<click selector="{{AdminProductGridFilterSection.applyFilters}}" stepKey="applyFilters"/>
40+
<click selector="{{AdminProductGridSection.firstRowCheckbox}}" stepKey="selectFirstFilteredProduct"/>
41+
<click selector="{{AdminProductGridActionSection.actionsSelectBox}}" stepKey="openActionsSelectBox"/>
42+
<click selector="{{AdminProductGridActionSection.deleteOptionInActionsSelectBox}}" stepKey="clickDeleteAction"/>
43+
<waitForElementVisible selector="{{AdminProductGridConfirmActionSection.title}}" stepKey="waitForConfirmModal"/>
44+
<click selector="{{AdminProductGridConfirmActionSection.ok}}" stepKey="clickOkInConfirmation"/>
45+
</actionGroup>
2846
</actionGroups>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridFilterSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<element name="applyFilters" type="button" selector="button[data-action='grid-filter-apply']" timeout="30"/>
1818
<element name="newFromDateFilter" type="input" selector="input.admin__control-text[name='news_from_date[from]']"/>
1919
<element name="skuFilter" type="input" selector="input.admin__control-text[name='sku']"/>
20+
<element name="name" type="input" selector="input.admin__control-text[name='name']"/>
2021
<element name="viewBookmark" type="button" selector="//div[contains(@class, 'admin__data-grid-action-bookmarks')]/ul/li/div/a[text() = '{{label}}']" parameterized="true" timeout="30"/>
2122
<element name="viewDropdown" type="button" selector=".admin__data-grid-action-bookmarks button.admin__action-dropdown"/>
2223
</section>

‎app/code/Magento/Catalog/Test/Mftf/Section/AdminProductGridSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
<element name="productGridXRowYColumnButton" type="input" selector="table.data-grid tr.data-row:nth-child({{row}}) td:nth-child({{column}})" parameterized="true" timeout="30"/>
2323
<element name="productNameInNameColumn" type="input" selector="//td[4]/div[@class='data-grid-cell-content']"/>
2424
<element name="checkbox" type="checkbox" selector="//div[contains(text(),'{{product}}')]/ancestor::tr[@class='data-row']//input[@class='admin__control-checkbox']" parameterized="true" />
25+
<element name="firstRowCheckbox" type="checkbox" selector="tr.data-row:nth-of-type(1) input.admin__control-checkbox"/>
2526
<element name="bulkActionOption" type="button" selector="//div[contains(@class,'admin__data-grid-header-row') and contains(@class, 'row')]//div[contains(@class, 'action-select-wrap')]//ul/li/span[text() = '{{label}}']" parameterized="true"/>
2627
<element name="productGridNameProduct" type="input" selector="//tbody//tr//td//div[contains(., '{{var1}}')]" parameterized="true" timeout="30"/>
2728
</section>

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

Lines changed: 43 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,45 @@
1919
<group value="configurable"/>
2020
<group value="product"/>
2121
</annotations>
22+
23+
<!-- Login as admin -->
2224
<before>
2325
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin1"/>
2426
</before>
27+
28+
<!-- Delete Created Products And Category Then Logout -->
2529
<after>
26-
<amOnPage url="admin/admin/auth/logout/" stepKey="amOnLogoutPage"/>
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">
44+
<argument name="product" value="_defaultProduct"/>
45+
</actionGroup>
46+
47+
<actionGroup ref="logout" stepKey="logout"/>
2748
</after>
2849

50+
<!-- Create category -->
2951
<amOnPage url="{{AdminCategoryPage.url}}" stepKey="amOnCategoryGridPage"/>
3052
<waitForPageLoad time="30" stepKey="waitForPageLoad1"/>
31-
3253
<click selector="{{AdminCategorySidebarActionSection.AddSubcategoryButton}}" stepKey="clickOnAddSubCategory"/>
3354
<fillField selector="{{AdminCategoryBasicFieldSection.CategoryNameInput}}" userInput="{{_defaultCategory.name}}" stepKey="enterCategoryName"/>
3455
<click selector="{{AdminCategorySEOSection.SectionHeader}}" stepKey="clickOnSeoSection"/>
3556
<fillField selector="{{AdminCategorySEOSection.UrlKeyInput}}" userInput="{{_defaultCategory.name_lwr}}" stepKey="enterUrlKey"/>
3657
<click selector="{{AdminCategoryMainActionsSection.SaveButton}}" stepKey="clickOnSaveCategory"/>
3758
<seeElement selector="{{AdminCategoryMessagesSection.SuccessMessage}}" stepKey="assertSuccessMessage"/>
3859

60+
<!-- Create configurable product... -->
3961
<amOnPage url="{{AdminProductIndexPage.url}}" stepKey="amOnProductGridPage"/>
4062
<waitForPageLoad time="30" stepKey="waitForPageLoad2"/>
4163
<click selector="{{AdminProductGridActionSection.addProductToggle}}" stepKey="clickOnAddProductToggle"/>
@@ -49,51 +71,64 @@
4971
<click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSection"/>
5072
<fillField userInput="{{_defaultProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="fillUrlKey"/>
5173

74+
<!-- Create Product Attribute -->
5275
<click selector="{{AdminProductFormConfigurationsSection.createConfigurations}}" stepKey="clickOnCreateConfigurations"/>
5376
<click selector="{{AdminCreateProductConfigurationsPanel.createNewAttribute}}" stepKey="clickOnNewAttribute"/>
5477
<switchToIFrame selector="{{AdminNewAttributePanel.newAttributeIFrame}}" stepKey="switchToNewAttributeIFrame"/>
5578
<fillField selector="{{AdminNewAttributePanel.defaultLabel}}" userInput="{{colorProductAttribute.default_label}}" stepKey="fillDefaultLabel"/>
5679
<click selector="{{AdminNewAttributePanel.saveAttribute}}" stepKey="clickOnNewAttributePanel"/>
5780

81+
<!-- Choose Created Attribute -->
5882
<switchToIFrame stepKey="switchOutOfIFrame"/>
5983
<click selector="{{AdminCreateProductConfigurationsPanel.filters}}" stepKey="clickOnFilters"/>
6084
<fillField userInput="{{colorProductAttribute.default_label}}" selector="{{AdminCreateProductConfigurationsPanel.attributeCode}}" stepKey="fillFilterAttributeCodeField"/>
6185
<click selector="{{AdminCreateProductConfigurationsPanel.applyFilters}}" stepKey="clickApplyFiltersButton"/>
6286
<click selector="{{AdminCreateProductConfigurationsPanel.firstCheckbox}}" stepKey="clickOnFirstCheckbox"/>
6387
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton1"/>
6488

89+
<!-- Create First Value for Attribute -->
6590
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue1"/>
6691
<fillField userInput="{{colorProductAttribute1.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute1"/>
6792
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute1"/>
6893

94+
<!-- Create Second Value for Attribute -->
6995
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue2"/>
7096
<fillField userInput="{{colorProductAttribute2.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute2"/>
7197
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute2"/>
7298

99+
<!-- Create Third Value for Attribute -->
73100
<click selector="{{AdminCreateProductConfigurationsPanel.createNewValue}}" stepKey="clickOnCreateNewValue3"/>
74101
<fillField userInput="{{colorProductAttribute3.name}}" selector="{{AdminCreateProductConfigurationsPanel.attributeName}}" stepKey="fillFieldForNewAttribute3"/>
75102
<click selector="{{AdminCreateProductConfigurationsPanel.saveAttribute}}" stepKey="clickOnSaveNewAttribute3"/>
76103

104+
<!-- Select All Values and Go On-->
77105
<click selector="{{AdminCreateProductConfigurationsPanel.selectAll}}" stepKey="clickOnSelectAll"/>
78106
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton2"/>
79107

108+
<!-- Apply Unique Prices By Attribute To Each SKU -->
80109
<click selector="{{AdminCreateProductConfigurationsPanel.applyUniquePricesByAttributeToEachSku}}" stepKey="clickOnApplyUniquePricesByAttributeToEachSku"/>
81110
<selectOption selector="{{AdminCreateProductConfigurationsPanel.selectAttribute}}" userInput="{{colorProductAttribute.default_label}}" stepKey="selectAttributes"/>
82111
<fillField selector="{{AdminCreateProductConfigurationsPanel.attribute1}}" userInput="{{colorProductAttribute1.price}}" stepKey="fillAttributePrice1"/>
83112
<fillField selector="{{AdminCreateProductConfigurationsPanel.attribute2}}" userInput="{{colorProductAttribute2.price}}" stepKey="fillAttributePrice2"/>
84113
<fillField selector="{{AdminCreateProductConfigurationsPanel.attribute3}}" userInput="{{colorProductAttribute3.price}}" stepKey="fillAttributePrice3"/>
85114

115+
<!-- Apply Unique Quantity to Each SKUs -->
86116
<click selector="{{AdminCreateProductConfigurationsPanel.applySingleQuantityToEachSkus}}" stepKey="clickOnApplySingleQuantityToEachSku"/>
87117
<fillField selector="{{AdminCreateProductConfigurationsPanel.quantity}}" userInput="1" stepKey="enterAttributeQuantity"/>
118+
119+
<!-- Finish Creating Configurations -->
88120
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton3"/>
89121
<click selector="{{AdminCreateProductConfigurationsPanel.next}}" stepKey="clickOnNextButton4"/>
90122

123+
<!-- Save Product -->
91124
<click selector="{{AdminProductFormActionSection.saveButton}}" stepKey="clickOnSaveButton2"/>
92125
<click selector="{{AdminChooseAffectedAttributeSetPopup.confirm}}" stepKey="clickOnConfirmInPopup"/>
93126

94-
<seeElement selector="{{AdminProductMessagesSection.successMessage}}" stepKey="seeSaveProductMessage"/>
127+
<!-- Make Sure Product Is Created -->
128+
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="seeSaveProductMessage"/>
95129
<seeInTitle userInput="{{_defaultProduct.name}}" stepKey="seeProductNameInTitle"/>
96130

131+
<!-- Make Sure Configurations Created Correctly -->
97132
<seeNumberOfElements selector="{{AdminProductFormConfigurationsSection.currentVariationsRows}}" userInput="3" stepKey="seeNumberOfRows"/>
98133
<see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeAttributeName1InField"/>
99134
<see selector="{{AdminProductFormConfigurationsSection.currentVariationsNameCells}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeAttributeName2InField"/>
@@ -106,22 +141,27 @@
106141
<see selector="{{AdminProductFormConfigurationsSection.currentVariationsPriceCells}}" userInput="{{colorProductAttribute3.price}}" stepKey="seeUniquePrice3InField"/>
107142
<see selector="{{AdminProductFormConfigurationsSection.currentVariationsQuantityCells}}" userInput="{{colorProductAttribute.attribute_quantity}}" stepKey="seeQuantityInField"/>
108143

144+
<!-- Go To StoreFront -->
109145
<amOnPage url="/" stepKey="amOnStorefront"/>
110146
<waitForPageLoad time="30" stepKey="waitForPageLoad3"/>
111147

148+
<!-- Go To Just Created Category -->
112149
<click userInput="{{_defaultCategory.name}}" stepKey="clickOnCategoryName"/>
113150
<waitForPageLoad time="30" stepKey="waitForPageLoad4"/>
114151

152+
<!-- Check Product Presence And Go Into The Product View -->
115153
<see userInput="{{_defaultProduct.name}}" stepKey="assertProductPresent"/>
116154
<see userInput="{{colorProductAttribute1.price}}" stepKey="assertProductPricePresent"/>
117155
<click userInput="{{_defaultProduct.name}}" stepKey="clickOnProductName"/>
118156
<waitForPageLoad time="30" stepKey="waitForPageLoad5"/>
119157

158+
<!-- Check Page's Title, Product Name, Price, Sku -->
120159
<seeInTitle userInput="{{_defaultProduct.name}}" stepKey="assertProductNameTitle"/>
121160
<see userInput="{{_defaultProduct.name}}" selector="{{StorefrontProductInfoMainSection.productName}}" stepKey="assertProductName"/>
122161
<see userInput="{{colorProductAttribute1.price}}" selector="{{StorefrontProductInfoMainSection.productPrice}}" stepKey="assertProductPrice"/>
123162
<see userInput="{{_defaultProduct.sku}}" selector="{{StorefrontProductInfoMainSection.productSku}}" stepKey="assertProductSku"/>
124163

164+
<!-- Check Options -->
125165
<see selector="{{StorefrontProductInfoMainSection.productAttributeTitle1}}" userInput="{{colorProductAttribute.default_label}}" stepKey="seeColorAttributeName1"/>
126166
<see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute1.name}}" stepKey="seeInDropDown1"/>
127167
<see selector="{{StorefrontProductInfoMainSection.productAttributeOptions1}}" userInput="{{colorProductAttribute2.name}}" stepKey="seeInDropDown2"/>

0 commit comments

Comments
 (0)