Skip to content

Commit 7d4adf4

Browse files
author
Mariana Lashch
committed
Merge branch '2.3-develop' of github.com:magento/magento2ce into port-2612
2 parents 2d7fa5c + bdf7c3e commit 7d4adf4

File tree

52 files changed

+2235
-172
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2235
-172
lines changed

‎app/code/Magento/Backend/Test/Mftf/Section/AdminSlideOutDialogSection.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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+
<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
11+
<section name="AdminSlideOutDialogSection">
12+
<element name="closeButton" type="button" selector=".modal-slide._show [data-role='closeBtn']" timeout="30"/>
13+
<element name="cancelButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Cancel']" timeout="30"/>
14+
<element name="doneButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Done']" timeout="30"/>
15+
<element name="saveButton" type="button" selector="//*[contains(@class, 'modal-slide') and contains(@class, '_show')]//*[contains(@class, 'page-actions')]//button[normalize-space(.)='Save']" timeout="30"/>
16+
</section>
17+
</sections>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="StorefrontMessagesSection">
1212
<element name="success" type="text" selector="div.message-success.success.message"/>
1313
<element name="error" type="text" selector="div.message-error.error.message"/>
14+
<element name="noticeMessage" type="text" selector="div.message-notice"/>
1415
</section>
1516
</sections>

‎app/code/Magento/Catalog/Test/Mftf/Test/CheckTierPricingOfProductsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@
147147
<!--Create new order-->
148148
<actionGroup ref="navigateToNewOrderPageExistingCustomer" stepKey="CreateNewOrder">
149149
<argument name="customer" value="Simple_US_Customer"/>
150+
<argument name="storeView" value="customStoreView"/>
150151
</actionGroup>
151-
<click selector="{{OrdersGridSection.website('secondStoreView')}}" stepKey="ClickToSelectStore"/>
152-
<waitForPageLoad stepKey="waitForPageOpened"/>
152+
153153
<click selector="{{OrdersGridSection.addProducts}}" stepKey="clickToAddProduct"/>
154154
<waitForPageLoad stepKey="waitForProductsOpened"/>
155155
<!--TEST CASE #1-->

‎app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-61717"/>
1919
<group value="Catalog"/>
20+
<!-- skip due to MAGETWO-97424 -->
21+
<group value="skip"/>
2022
</annotations>
2123
<before>
2224
<createData entity="Simple_US_Customer" stepKey="createCustomer"/>

‎app/code/Magento/Checkout/Test/Mftf/Section/StorefrontCheckoutPaymentMethodSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
<section name="StorefrontCheckoutPaymentMethodSection">
1212
<element name="billingAddress" type="text" selector=".checkout-billing-address"/>
1313
<element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[@class='payment-method']//label//span[contains(., '{{methodName}}')]/../..//input" parameterized="true"/>
14+
<element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
1415
</section>
1516
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest.xml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
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="StorefrontShoppingCartCheckCustomerDefaultShippingAddressForVirtualQuoteTest">
12+
<annotations>
13+
<features value="Checkout"/>
14+
<stories value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
15+
<title value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
16+
<description value="Estimator in Shopping cart must be pre-filled by Customer default shipping address for virtual quote"/>
17+
<severity value="CRITICAL"/>
18+
<testCaseId value="MAGETWO-46795"/>
19+
<group value="checkout"/>
20+
</annotations>
21+
<before>
22+
<createData entity="_defaultCategory" stepKey="createCategory"/>
23+
<createData entity="defaultVirtualProduct" stepKey="createVirtualProduct">
24+
<requiredEntity createDataKey="createCategory"/>
25+
</createData>
26+
<createData entity="Simple_US_Customer_CA" stepKey="createCustomer">
27+
<field key="group_id">1</field>
28+
</createData>
29+
</before>
30+
<after>
31+
<actionGroup ref="StorefrontCustomerLogoutActionGroup" stepKey="customerLogout"/>
32+
<deleteData createDataKey="createVirtualProduct" stepKey="deleteVirtualProduct"/>
33+
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
34+
<deleteData createDataKey="createCustomer" stepKey="deleteCustomer"/>
35+
</after>
36+
<!-- Steps -->
37+
<!-- Step 1: Go to Storefront as Customer -->
38+
<actionGroup ref="LoginToStorefrontActionGroup" stepKey="customerLogin">
39+
<argument name="Customer" value="$$createCustomer$$" />
40+
</actionGroup>
41+
<!-- Step 2: Add virtual product to cart -->
42+
<amOnPage url="{{StorefrontProductPage.url($$createVirtualProduct.custom_attributes[url_key]$)}}" stepKey="amOnPage"/>
43+
<actionGroup ref="StorefrontAddProductToCartActionGroup" stepKey="addProductToCart">
44+
<argument name="product" value="$$createVirtualProduct$$"/>
45+
<argument name="productCount" value="1"/>
46+
</actionGroup>
47+
<!-- Step 3: Go to Shopping Cart -->
48+
<actionGroup ref="clickViewAndEditCartFromMiniCart" stepKey="goToShoppingcart"/>
49+
<!-- Step 4: Open Estimate Tax section -->
50+
<click selector="{{CheckoutCartSummarySection.estimateShippingAndTax}}" stepKey="openEstimateTaxSection"/>
51+
<see selector="{{CheckoutCartSummarySection.country}}" userInput="{{US_Address_CA.country_id}}" stepKey="checkCountry"/>
52+
<see selector="{{CheckoutCartSummarySection.stateProvince}}" userInput="{{US_Address_CA.state}}" stepKey="checkState"/>
53+
<scrollTo selector="{{CheckoutCartSummarySection.postcode}}" stepKey="scrollToPostCodeField"/>
54+
<grabValueFrom selector="{{CheckoutCartSummarySection.postcode}}" stepKey="grabTextPostCode"/>
55+
<assertEquals message="Customer postcode is invalid" stepKey="checkCustomerPostcode">
56+
<expectedResult type="string">{{US_Address_CA.postcode}}</expectedResult>
57+
<actualResult type="variable">grabTextPostCode</actualResult>
58+
</assertEquals>
59+
</test>
60+
</tests>

‎app/code/Magento/Config/Test/Mftf/Data/WebUrlOptionsConfigData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="DefaultWebUrlOptionsConfig" type="web_url_use_store">
12+
<requiredEntity type="url_use_store_value">DefaultConfigWebUrlOptions</requiredEntity>
13+
</entity>
14+
<entity name="DefaultConfigWebUrlOptions" type="url_use_store_value">
15+
<data key="value">0</data>
16+
</entity>
17+
18+
<entity name="EnableWebUrlOptionsConfig" type="web_url_use_store">
19+
<requiredEntity type="url_use_store_value">WebUrlOptionsYes</requiredEntity>
20+
</entity>
21+
<entity name="WebUrlOptionsYes" type="url_use_store_value">
22+
<data key="value">1</data>
23+
</entity>
24+
</entities>

‎app/code/Magento/Config/Test/Mftf/Metadata/web_url_options_config-meta.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
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+
<operations xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataOperation.xsd">
10+
<operation name="WebUrlOptionsConfig" dataType="web_url_use_store" type="create" auth="adminFormKey" url="/admin/system_config/save/section/web/"
11+
method="POST" successRegex="/messages-message-success/" returnRegex="">
12+
<object key="groups" dataType="web_url_use_store">
13+
<object key="url" dataType="web_url_use_store">
14+
<object key="fields" dataType="web_url_use_store">
15+
<object key="use_store" dataType="url_use_store_value">
16+
<field key="value">string</field>
17+
</object>
18+
</object>
19+
</object>
20+
</object>
21+
</operation>
22+
</operations>

‎app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ define([
291291
images = this.options.spConfig.images[this.simpleProduct];
292292

293293
if (images) {
294+
images = this._sortImages(images);
295+
294296
if (this.options.gallerySwitchStrategy === 'prepend') {
295297
images = images.concat(initialImages);
296298
}
@@ -309,7 +311,17 @@ define([
309311
$(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
310312
}
311313

312-
galleryObject.first();
314+
},
315+
316+
/**
317+
* Sorting images array
318+
*
319+
* @private
320+
*/
321+
_sortImages: function (images) {
322+
return _.sortBy(images, function (image) {
323+
return image.position;
324+
});
313325
},
314326

315327
/**

‎app/code/Magento/Customer/Test/Mftf/Data/CustomerConfigData.xml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
11+
<entity name="CustomerAccountSharingDefault" type="customer_account_sharing_config">
12+
<requiredEntity type="account_share_scope_value">CustomerAccountSharingPerWebsite</requiredEntity>
13+
</entity>
14+
<entity name="CustomerAccountSharingPerWebsite" type="account_share_scope_value">
15+
<data key="value">1</data>
16+
</entity>
17+
18+
<entity name="CustomerAccountSharingGlobal" type="customer_account_sharing_config">
19+
<requiredEntity type="account_share_scope_value">GlobalCustomerAccountSharing</requiredEntity>
20+
</entity>
21+
<entity name="GlobalCustomerAccountSharing" type="account_share_scope_value">
22+
<data key="value">0</data>
23+
</entity>
24+
</entities>

0 commit comments

Comments
 (0)