Skip to content

Commit 23b5540

Browse files
committed
MC-37418: [Safari browser] Popup not closed with a configuration.
1 parent 41cf218 commit 23b5540

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerWishlistConfigureItemActionGroup.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
<argument name="title" type="string" defaultValue="{{Attribute.label}}"/>
1414
<argument name="option" type="string" defaultValue="option1"/>
1515
<argument name="quantity" type="string" defaultValue="2"/>
16+
<argument name="productName" type="string" defaultValue="{{ApiConfigurableProductWithOutCategory.name}}"/>
1617
</arguments>
17-
<click selector="{{AdminCustomerWishlistSection.configureButton}}" stepKey="clickConfigureButton"/>
18+
<click selector="{{AdminCustomerWishlistSection.configureButton(productName)}}" stepKey="clickConfigureButton"/>
1819
<waitForElementVisible selector="{{AdminCustomerWishlistSection.productAttributeOptionsDropDown(title)}}" stepKey="waitForConfigurableOption"/>
1920
<selectOption selector="{{AdminCustomerWishlistSection.productAttributeOptionsDropDown(title)}}" userInput="{{option}}" stepKey="selectConfigurableOption"/>
2021
<fillField selector="{{AdminOrderFormConfigureProductSection.quantity}}" userInput="{{quantity}}" stepKey="fillQty"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
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="//table[@id='wishlistGrid_table']//td[@data-column='action']//a[@class='configure-item-link']" timeout="30"/>
17+
<element name="configureButton" type="text" selector="//table[@id='wishlistGrid_table']//tbody//td[@data-column='product_name' and contains(text(),'{{var1}}')]/parent::tr//td[@data-column='action']//a[@class='configure-item-link']" timeout="30" parameterized="true"/>
1818
<element name="productAttributeOptionsDropDown" type="text" selector="//label[contains(.,'{{var1}}')]/following::div[contains(@class,'control')]//select" parameterized="true"/>
1919
<element name="productQty" type="text" selector="//table[@id='wishlistGrid_table']//td[@data-column='qty' and contains(@class, 'col-number')]"/>
2020
</section>

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
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"/>
19+
<useCaseId value="MC-37418"/>
2020
<group value="wishlist"/>
2121
</annotations>
2222
<before>
@@ -68,6 +68,7 @@
6868
</createData>
6969
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
7070
<magentoCron groups="index" stepKey="reindexBrokenIndices"/>
71+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
7172
</before>
7273
<after>
7374
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
@@ -83,22 +84,21 @@
8384
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
8485
<argument name="Customer" value="$createCustomer$"/>
8586
</actionGroup>
86-
<amOnPage url="{{StorefrontProductPage.url($createConfigProduct.custom_attributes[url_key]$)}}" stepKey="goToProductPage"/>
87+
<actionGroup ref="StorefrontOpenProductPageActionGroup" stepKey="openProductPage">
88+
<argument name="productUrl" value="$createConfigProduct.custom_attributes[url_key]$"/>
89+
</actionGroup>
8790
<actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addToWishlistProduct">
8891
<argument name="productVar" value="$createConfigProduct$"/>
8992
</actionGroup>
90-
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
9193
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage">
9294
<argument name="customer" value="$createCustomer$"/>
9395
</actionGroup>
9496
<actionGroup ref="AdminNavigateCustomerWishlistTabActionGroup" stepKey="navigateToWishlistTab"/>
95-
<actionGroup ref="AdminCustomerFindWishlistItemActionGroup" stepKey="findWishlistItem">
96-
<argument name="productName" value="$createConfigProduct.name$"/>
97-
</actionGroup>
9897
<actionGroup ref="AdminCustomerWishlistConfigureItemActionGroup" stepKey="editItem">
9998
<argument name="title" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
10099
<argument name="option" value="$getConfigAttributeOption1.label$"/>
101100
<argument name="quantity" value="2"/>
101+
<argument name="productName" value="$createConfigProduct.name$"/>
102102
</actionGroup>
103103
<click selector="{{AdminMainActionsSection.save}}" stepKey="saveCustomer"/>
104104
<waitForElementVisible selector="{{AdminMessagesSection.success}}" stepKey="waitForSuccessMessage"/>

0 commit comments

Comments
 (0)