Skip to content

Commit 6d47088

Browse files
OlgaVasyltsunOlgaVasyltsun
committed
MC-37418: [Safari browser] Popup not closed with a configuration.
1 parent 3a30ee2 commit 6d47088

File tree

5 files changed

+149
-6
lines changed

5 files changed

+149
-6
lines changed

‎app/code/Magento/Catalog/view/adminhtml/web/catalog/product/composite/configure.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,10 @@ define([
4747
* Initialize object
4848
*/
4949
initialize: function () {
50-
var self = this,
51-
popupDialog = jQuery('#product_composite_configure');
50+
var self = this;
5251

5352
this._initWindowElements();
5453
jQuery.async('#product_composite_configure', function (el) {
55-
if (el !== popupDialog[0]) {
56-
el = popupDialog[0];
57-
}
5854
self.dialog = jQuery(el).modal({
5955
title: jQuery.mage.__('Configure Product'),
6056
type: 'slide',

‎app/code/Magento/Customer/Test/Mftf/ActionGroup/AdminCustomerEditWishlistItemActionGroup.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
11+
<actionGroup name="AdminCustomerEditWishlistItemActionGroup">
12+
<arguments>
13+
<argument name="title" type="string"/>
14+
<argument name="option" type="string"/>
15+
<argument name="quantity" type="string"/>
16+
</arguments>
17+
<click selector="{{AdminCustomerWishlistSection.configureButton}}" stepKey="clickConfigureButton"/>
18+
<waitForAjaxLoad stepKey="waitForPopupLoad"/>
19+
<waitForElementVisible selector="{{AdminCustomerWishlistSection.productAttributeOptionsDropDown(title)}}" stepKey="waitForConfigurableOption"/>
20+
<selectOption selector="{{AdminCustomerWishlistSection.productAttributeOptionsDropDown(title)}}" userInput="option" stepKey="selectConfigurableOption"/>
21+
<fillField userInput="{{quantity}}" selector="{{AdminOrderFormConfigureProductSection.quantity}}" stepKey="fillQty"/>
22+
<click selector="{{AdminOrderFormConfigureProductSection.ok}}" stepKey="confirmSave"/>
23+
<waitForAjaxLoad stepKey="waitForPopupClose"/>
24+
</actionGroup>
25+
</actionGroups>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +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']"/>
18+
<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"/>
1720
</section>
1821
</sections>

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

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
9+
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
11+
<test name="AdminConfigureCustomerWishListItemTest">
12+
<annotations>
13+
<features value="Wishlist"/>
14+
<stories value="Wishlist item configuration"/>
15+
<title value="Admin configures an item from customer wishlist"/>
16+
<description value="Admin should be able to configure items from customer wishlist"/>
17+
<severity value="MAJOR"/>
18+
<testCaseId value="MC-40455"/>
19+
<group value="wishlist"/>
20+
</annotations>
21+
<before>
22+
<createData entity="SimpleSubCategory" stepKey="createCategory"/>
23+
<!-- Create the configurable product based on the data in the /data folder -->
24+
<createData entity="ApiConfigurableProduct" stepKey="createConfigProduct">
25+
<requiredEntity createDataKey="createCategory"/>
26+
</createData>
27+
28+
<!-- Make the configurable product have two options, that are children of the default attribute set -->
29+
<createData entity="productAttributeWithTwoOptions" stepKey="createConfigProductAttribute"/>
30+
<createData entity="productAttributeOption1" stepKey="createConfigProductAttributeOption1">
31+
<requiredEntity createDataKey="createConfigProductAttribute"/>
32+
</createData>
33+
<createData entity="productAttributeOption2" stepKey="createConfigProductAttributeOption2">
34+
<requiredEntity createDataKey="createConfigProductAttribute"/>
35+
</createData>
36+
<createData entity="AddToDefaultSet" stepKey="createConfigAddToAttributeSet">
37+
<requiredEntity createDataKey="createConfigProductAttribute"/>
38+
</createData>
39+
<getData entity="ProductAttributeOptionGetter" index="1" stepKey="getConfigAttributeOption1">
40+
<requiredEntity createDataKey="createConfigProductAttribute"/>
41+
</getData>
42+
<getData entity="ProductAttributeOptionGetter" index="2" stepKey="getConfigAttributeOption2">
43+
<requiredEntity createDataKey="createConfigProductAttribute"/>
44+
</getData>
45+
46+
<!-- Create the 2 children that will be a part of the configurable product -->
47+
<createData entity="ApiSimpleOne" stepKey="createConfigChildProduct1">
48+
<requiredEntity createDataKey="createConfigProductAttribute"/>
49+
<requiredEntity createDataKey="getConfigAttributeOption1"/>
50+
</createData>
51+
<createData entity="ApiSimpleTwo" stepKey="createConfigChildProduct2">
52+
<requiredEntity createDataKey="createConfigProductAttribute"/>
53+
<requiredEntity createDataKey="getConfigAttributeOption2"/>
54+
</createData>
55+
56+
<!-- Assign the two products to the configurable product -->
57+
<createData entity="ConfigurableProductTwoOptions" stepKey="createConfigProductOption">
58+
<requiredEntity createDataKey="createConfigProduct"/>
59+
<requiredEntity createDataKey="createConfigProductAttribute"/>
60+
<requiredEntity createDataKey="getConfigAttributeOption1"/>
61+
<requiredEntity createDataKey="getConfigAttributeOption2"/>
62+
</createData>
63+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild1">
64+
<requiredEntity createDataKey="createConfigProduct"/>
65+
<requiredEntity createDataKey="createConfigChildProduct1"/>
66+
</createData>
67+
<createData entity="ConfigurableProductAddChild" stepKey="createConfigProductAddChild2">
68+
<requiredEntity createDataKey="createConfigProduct"/>
69+
<requiredEntity createDataKey="createConfigChildProduct2"/>
70+
</createData>
71+
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>
72+
</before>
73+
<after>
74+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
75+
<deleteData createDataKey="createConfigProduct" stepKey="deleteConfigProduct"/>
76+
<deleteData createDataKey="createConfigChildProduct1" stepKey="deleteConfigChildProduct1"/>
77+
<deleteData createDataKey="createConfigChildProduct2" stepKey="deleteConfigChildProduct2"/>
78+
<deleteData createDataKey="createConfigProductAttribute" stepKey="deleteConfigProductAttribute"/>
79+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
80+
<actionGroup ref="AdminLogoutActionGroup" stepKey="logoutOfAdmin"/>
81+
<actionGroup ref="CliIndexerReindexActionGroup" stepKey="reindex">
82+
<argument name="indices" value=""/>
83+
</actionGroup>
84+
</after>
85+
86+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="loginToStorefrontAccount">
87+
<argument name="Customer" value="$createCustomer$"/>
88+
</actionGroup>
89+
<actionGroup ref="OpenProductFromCategoryPageActionGroup" stepKey="openProductFromCategory">
90+
<argument name="category" value="$createCategory$"/>
91+
<argument name="product" value="$createConfigProduct$"/>
92+
</actionGroup>
93+
<actionGroup ref="StorefrontCustomerAddProductToWishlistActionGroup" stepKey="addToWishlistProduct">
94+
<argument name="productVar" value="$createConfigProduct$"/>
95+
</actionGroup>
96+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="logout"/>
97+
<actionGroup ref="AdminLogoutActionGroup" stepKey="adminLogoutBeforeCheck"/>
98+
<actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
99+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage">
100+
<argument name="customer" value="$createCustomer$"/>
101+
</actionGroup>
102+
<actionGroup ref="AdminNavigateCustomerWishlistTabActionGroup" stepKey="navigateToWishlistTab"/>
103+
<actionGroup ref="AdminCustomerFindWishlistItemActionGroup" stepKey="findWishlistItem">
104+
<argument name="productName" value="$createConfigProduct.name$"/>
105+
</actionGroup>
106+
<actionGroup ref="AdminCustomerEditWishlistItemActionGroup" stepKey="deleteItem">
107+
<argument name="title" value="$createConfigProductAttribute.attribute[frontend_labels][0][label]$"/>
108+
<argument name="option" value="$getConfigAttributeOption1.label$"/>
109+
<argument name="quantity" value="2"/>
110+
</actionGroup>
111+
<click selector="{{AdminCustomerMainActionsSection.saveButton}}" stepKey="saveCustomer"/>
112+
<seeElement selector="{{AdminCustomerMessagesSection.successMessage}}" stepKey="assertSuccessMessage"/>
113+
<actionGroup ref="OpenEditCustomerFromAdminActionGroup" stepKey="navigateToCustomerEditPage2">
114+
<argument name="customer" value="$createCustomer$"/>
115+
</actionGroup>
116+
<actionGroup ref="AdminNavigateCustomerWishlistTabActionGroup" stepKey="navigateToWishlistTabAgain"/>
117+
<waitForElementVisible selector="{{AdminCustomerWishlistSection.productQty}}" stepKey="waitForProductQuantityVisible"/>
118+
<see selector="{{AdminCustomerWishlistSection.productQty}}" userInput="2" stepKey="assertProductQuantity"/>
119+
</test>
120+
</tests>

‎app/code/Magento/Wishlist/view/adminhtml/layout/customer_index_wishlist.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,5 @@
112112
</arguments>
113113
</block>
114114
</block>
115-
<block class="Magento\Catalog\Block\Adminhtml\Product\Composite\Configure" template="Magento_Catalog::catalog/product/composite/configure.phtml" name="configure.popup"/>
116115
</container>
117116
</layout>

0 commit comments

Comments
 (0)