Skip to content

Commit 4267372

Browse files
OlgaVasyltsunOlgaVasyltsun
committed
MC-37418: [Safari browser] Popup not closed with a configuration.
1 parent 35a73ea commit 4267372

File tree

3 files changed

+17
-26
lines changed

3 files changed

+17
-26
lines changed

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerEditWishlistItemActionGroup.xml renamed to app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerWishlistConfigureItemActionGroup.xml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,16 @@
88

99
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11-
<actionGroup name="AdminCustomerEditWishlistItemActionGroup">
11+
<actionGroup name="AdminCustomerWishlistConfigureItemActionGroup">
1212
<arguments>
13-
<argument name="title" type="string"/>
14-
<argument name="option" type="string"/>
15-
<argument name="quantity" type="string"/>
13+
<argument name="title" type="string" defaultValue="{{Attribute.label}}"/>
14+
<argument name="option" type="string" defaultValue="option1"/>
15+
<argument name="quantity" type="string" defaultValue="2"/>
1616
</arguments>
1717
<click selector="{{AdminCustomerWishlistSection.configureButton}}" stepKey="clickConfigureButton"/>
18-
<waitForAjaxLoad stepKey="waitForPopupLoad"/>
1918
<waitForElementVisible selector="{{AdminCustomerWishlistSection.productAttributeOptionsDropDown(title)}}" stepKey="waitForConfigurableOption"/>
2019
<selectOption selector="{{AdminCustomerWishlistSection.productAttributeOptionsDropDown(title)}}" userInput="{{option}}" stepKey="selectConfigurableOption"/>
2120
<fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQty"/>
2221
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="confirmSave"/>
23-
<waitForAjaxLoad stepKey="waitForPopupClose"/>
2422
</actionGroup>
2523
</actionGroups>

‎app/code/Magento/Customer/Test/Mftf/Section/AdminCustomerWishlistSection.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<element name="deleteButton" type="text" selector="//*[@id='wishlistGrid_table']//*[@data-column='action']//*[text()='Delete']"/>
1515
<element name="deleteConfirm" type="button" selector=".modal-popup.confirm .action-primary.action-accept"/>
1616
<element name="gridTable" type="text" selector="#wishlistGrid_table"/>
17-
<element name="configureButton" type="text" selector="//*[@id='wishlistGrid_table']//*[@data-column='action']//*[text()='Configure']"/>
17+
<element name="configureButton" type="text" selector="//table[@id='wishlistGrid_table']//td[@data-column='action']//a[@class='configure-item-link']" timeout="30"/>
1818
<element name="productAttributeOptionsDropDown" type="text" selector="//label[contains(.,'{{var1}}')]/following::div[contains(@class,'control')]//select" parameterized="true"/>
19-
<element name="productQty" type="text" selector="td.col-qty"/>
19+
<element name="productQty" type="text" selector="//table[@id='wishlistGrid_table']//td[@data-column='qty' and contains(@class, 'col-number')]"/>
2020
</section>
2121
</sections>

‎app/code/Magento/Wishlist/Test/Mftf/Test/AdminConfigureCustomerWishListItemTest.xml‎

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,16 @@
1212
<annotations>
1313
<features value="Wishlist"/>
1414
<stories value="Wishlist item configuration"/>
15-
<title value="Admin configures an item from customer wishlist"/>
15+
<title value="Admin can configure a customer wishlist item"/>
1616
<description value="Admin should be able to configure items from customer wishlist"/>
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-40455"/>
19+
<useCaseId value="MC-36575"/>
1920
<group value="wishlist"/>
2021
</annotations>
2122
<before>
22-
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
2323
<!-- Create the configurable product based on the data in the /data folder -->
24-
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
25-
<requiredEntity createDataKey="createCategory"/>
26-
</createData>
24+
<createData entity="ApiConfigurableProductWithOutCategory" stepKey="createConfigProduct"/>
2725

2826
<!-- Make the configurable product have two options, that are children of the default attribute set -->
2927
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
@@ -69,32 +67,26 @@
6967
<requiredEntity createDataKey="createConfigChildProduct2"/>
7068
</createData>
7169
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
70+
<magentoCron groups="index" stepKey="reindexBrokenIndices"/>
7271
</before>
7372
<after>
74-
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
7573
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
7674
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
7775
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
7876
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
77+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logout"/>
7978
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
8079
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
81-
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
82-
<argument name="indices" value=""/>
83-
</actionGroup>
80+
<magentoCron groups="index" stepKey="reindexBrokenIndices"/>
8481
</after>
8582

8683
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
8784
<argument name="Customer" value="$createCustomer$"/>
8885
</actionGroup>
89-
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
90-
<argument name="category" value="$createCategory$"/>
91-
<argument name="product" value="$createConfigProduct$"/>
92-
</actionGroup>
86+
<amOnPage url="{{StorefrontProductPage.url($createConfigProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
9387
<actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addToWishlistProduct">
9488
<argument name="productVar" value="$createConfigProduct$"/>
9589
</actionGroup>
96-
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logout"/>
97-
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogoutBeforeCheck"/>
9890
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
9991
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage">
10092
<argument name="customer" value="$createCustomer$"/>
@@ -103,13 +95,14 @@
10395
<actionGroup ref="AdminCustomerFindWishlistItemActionGroup" stepKey="findWishlistItem">
10496
<argument name="productName" value="$createConfigProduct.name$"/>
10597
</actionGroup>
106-
<actionGroup ref="AdminCustomerEditWishlistItemActionGroup" stepKey="editItem">
98+
<actionGroup ref="AdminCustomerWishlistConfigureItemActionGroup" stepKey="editItem">
10799
<argument name="title" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
108100
<argument name="option" value="$getConfigAttributeOption1.label$"/>
109101
<argument name="quantity" value="2"/>
110102
</actionGroup>
111-
<click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
112-
<seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
103+
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCustomer"/>
104+
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>
105+
<seeElement selector="{{AdminMessagesSection.success}}" stepKey="assertSuccessMessage"/>
113106
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage2">
114107
<argument name="customer" value="$createCustomer$"/>
115108
</actionGroup>

0 commit comments

Comments
 (0)