Skip to content

Commit c0d5c98

Browse files
magento-cicd2magento-cicd2
authored
merge magento/2.3-develop into magento-pangolin/MQE-1688
2 parents 950d2a5 + 7e1857d commit c0d5c98

File tree

31 files changed

+18
-105
lines changed

31 files changed

+18
-105
lines changed

‎app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAddBundleOptionsToCartTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-95933"/>
1919
<group value="Bundle"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="login"/>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<description value="User browses catalog, searches for product, adds product to cart, adds product to wishlist, compares products, uses coupon code and checks out."/>
1818
<severity value="CRITICAL"/>
1919
<testCaseId value="MAGETWO-87435"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<resetCookie userInput="PHPSESSID" stepKey="resetCookieForCart"/>

‎app/code/Magento/CatalogRule/Test/Mftf/Test/ApplyCatalogRuleForSimpleProductWithCustomOptionsTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<testCaseId value="MC-14769"/>
1818
<group value="CatalogRule"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<!-- Login as Admin -->

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/AssertStorefrontShoppingCartSummaryWithShippingActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
</arguments>
1818

1919
<waitForElementVisible selector="{{CheckoutCartSummarySection.shipping}}" stepKey="waitForElementToBeVisible" after="assertSubtotal"/>
20-
<waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="30" stepKey="assertShipping" after="waitForElementToBeVisible"/>
20+
<reloadPage stepKey="reloadPage" after="waitForElementToBeVisible" />
21+
<waitForPageLoad after="reloadPage" stepKey="WaitForPageLoaded" />
22+
<waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="30" stepKey="assertShipping" after="WaitForPageLoaded"/>
2123
</actionGroup>
2224
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontCheckCartDiscountAndSummaryActionGroup.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<waitForLoadingMaskToDisappear stepKey="waitForPrices"/>
2323
<see selector="{{CheckoutCartSummarySection.discountAmount}}" userInput="-${{discount}}" stepKey="assertDiscount"/>
2424
<wait time="10" stepKey="waitForTotalPrice"/>
25-
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal"/>
25+
<reloadPage stepKey="reloadPage" after="waitForTotalPrice" />
26+
<waitForPageLoad after="reloadPage" stepKey="WaitForPageLoaded" />
27+
<see selector="{{CheckoutCartSummarySection.total}}" userInput="${{total}}" stepKey="assertTotal" after="WaitForPageLoaded"/>
2628
</actionGroup>
2729
</actionGroups>

‎app/code/Magento/Checkout/Test/Mftf/ActionGroup/StorefrontProductCartActionGroup.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,10 @@
114114
<checkOption selector="{{CheckoutCartSummarySection.flatRateShippingMethod}}" stepKey="selectShippingMethod"/>
115115
<see userInput="{{subtotal}}" selector="{{CheckoutCartSummarySection.subtotal}}" stepKey="assertSubtotal"/>
116116
<see userInput="({{shippingMethod}})" selector="{{CheckoutCartSummarySection.shippingMethod}}" stepKey="assertShippingMethod"/>
117-
<waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping"/>
118-
<see userInput="{{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal"/>
117+
<reloadPage stepKey="reloadPage" after="assertShippingMethod" />
118+
<waitForPageLoad stepKey="WaitForPageLoaded" after="reloadPage" />
119+
<waitForText userInput="{{shipping}}" selector="{{CheckoutCartSummarySection.shipping}}" time="45" stepKey="assertShipping" after="WaitForPageLoaded"/>
120+
<see userInput="{{total}}" selector="{{CheckoutCartSummarySection.total}}" stepKey="assertTotal" after="assertShipping"/>
119121
</actionGroup>
120122

121123
<!-- Open the Cart from Minicart-->

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="EndToEndB2CGuestUserTest">
12-
<annotations>
13-
<skip>
14-
<issueId value="MC-16684"/>
15-
</skip>
16-
</annotations>
1712
<!-- Step 3: User adds products to cart -->
1813
<comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
1914
<!-- Add Simple Product 1 to cart -->

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="EndToEndB2CLoggedInUserTest">
12-
<annotations>
13-
<skip>
14-
<issueId value="MC-16684"/>
15-
</skip>
16-
</annotations>
1712
<!-- Step 3: User adds products to cart -->
1813
<comment userInput="Start of adding products to cart" stepKey="startOfAddingProductsToCart" after="endOfBrowsingCatalog"/>
1914
<!-- Add Simple Product 1 to cart -->

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14715"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14719"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14716"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14718"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14727"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
<testCaseId value="MC-14728"/>
1616
<severity value="CRITICAL"/>
1717
<group value="mtf_migrated"/>
18-
<skip>
19-
<issueId value="MC-16684"/>
20-
</skip>
2118
</annotations>
2219

2320
<before>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<testCaseId value="MC-14709"/>
1717
<group value="mtf_migrated"/>
1818
<skip>
19-
<issueId value="MC-16684"/>
19+
<issueId value="MC-18802"/>
2020
</skip>
2121
</annotations>
2222

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MAGETWO-58179"/>
1919
<group value="checkout"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<createData entity="SimpleProduct2" stepKey="createSimpleProduct">

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontCheckTaxAddingValidVATIdTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MAGETWO-95028"/>
1919
<group value="customer"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<!--Log In-->

‎app/code/Magento/Customer/Test/Mftf/Test/StorefrontForgotPasswordTest.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@
2121
</annotations>
2222
<before>
2323
<magentoCLI command="config:set {{StorefrontCustomerCaptchaDisableConfigData.path}} {{StorefrontCustomerCaptchaDisableConfigData.value}}" stepKey="disableCaptcha"/>
24+
<magentoCLI command="config:set customer/password/max_number_password_reset_requests 30" stepKey="increaseLimit"/>
25+
<magentoCLI command="config:set customer/password/min_time_between_password_reset_requests 1" stepKey="reduceTimeout"/>
2426
<createData stepKey="customer" entity="Simple_US_Customer"/>
2527
</before>
2628
<after>

‎app/code/Magento/Customer/view/frontend/web/js/customer-data.js

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -198,13 +198,11 @@ define([
198198
* Customer data initialization
199199
*/
200200
init: function () {
201-
var countryData,
202-
privateContentVersion = 'private_content_version',
201+
var privateContentVersion = 'private_content_version',
203202
privateContent = $.cookieStorage.get(privateContentVersion),
204203
localPrivateContent = $.localStorage.get(privateContentVersion),
205204
needVersion = 'need_version',
206-
expiredSectionNames = this.getExpiredSectionNames(),
207-
isLoading = false;
205+
expiredSectionNames = this.getExpiredSectionNames();
208206

209207
if (privateContent &&
210208
!$.cookieStorage.isSet(privateContentVersion) &&
@@ -213,7 +211,6 @@ define([
213211
$.cookieStorage.set(privateContentVersion, needVersion);
214212
$.localStorage.set(privateContentVersion, needVersion);
215213
this.reload([], false);
216-
isLoading = true;
217214
} else if (localPrivateContent !== privateContent) {
218215
if (!$.cookieStorage.isSet(privateContentVersion)) {
219216
privateContent = needVersion;
@@ -224,7 +221,6 @@ define([
224221
buffer.notify(sectionName, sectionData);
225222
});
226223
this.reload([], false);
227-
isLoading = true;
228224
} else if (expiredSectionNames.length > 0) {
229225
_.each(dataProvider.getFromStorage(storage.keys()), function (sectionData, sectionName) {
230226
buffer.notify(sectionName, sectionData);
@@ -239,14 +235,6 @@ define([
239235
this.reload(storageInvalidation.keys(), false);
240236
}
241237
}
242-
243-
if (!_.isEmpty(privateContent)) {
244-
countryData = this.get('directory-data');
245-
246-
if (_.isEmpty(countryData()) && !isLoading) {
247-
customerData.reload(['directory-data'], false);
248-
}
249-
}
250238
},
251239

252240
/**
@@ -332,6 +320,9 @@ define([
332320
},
333321

334322
/**
323+
* Avoid using this function directly 'cause of possible performance drawbacks.
324+
* Each customer section reload brings new non-cached ajax request.
325+
*
335326
* @param {Array} sectionNames
336327
* @param {Boolean} forceNewSectionTimestamp
337328
* @return {*}

‎app/code/Magento/Customer/view/frontend/web/js/zxcvbn.js

Lines changed: 0 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCartRulesAppliedForProductInCartTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
<testCaseId value="MAGETWO-96722"/>
1919
<useCaseId value="MAGETWO-96410"/>
2020
<group value="SalesRule"/>
21-
<skip>
22-
<issueId value="MC-16684"/>
23-
</skip>
2421
</annotations>
2522

2623
<before>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionAndFreeShippingIsAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<group value="SalesRule"/>
1818
<group value="mtf_migrated"/>
19-
<skip>
20-
<issueId value="MC-16684"/>
21-
</skip>
2219
</annotations>
2320

2421
<before>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleAndVerifyRuleConditionIsNotAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<group value="SalesRule"/>
1818
<group value="mtf_migrated"/>
19-
<skip>
20-
<issueId value="MC-16684"/>
21-
</skip>
2219
</annotations>
2320

2421
<before>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleForMatchingSubtotalAndVerifyRuleConditionIsAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<group value="SalesRule"/>
1818
<group value="mtf_migrated"/>
19-
<skip>
20-
<issueId value="MC-16684"/>
21-
</skip>
2219
</annotations>
2320

2421
<before>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingCategoryAndVerifyRuleConditionIsAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<group value="SalesRule"/>
1818
<group value="mtf_migrated"/>
19-
<skip>
20-
<issueId value="MC-16684"/>
21-
</skip>
2219
</annotations>
2320

2421
<before>

‎app/code/Magento/SalesRule/Test/Mftf/Test/AdminCreateCartPriceRuleWithMatchingTotalWeightAndVerifyRuleConditionIsAppliedTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
<severity value="CRITICAL"/>
1717
<group value="SalesRule"/>
1818
<group value="mtf_migrated"/>
19-
<skip>
20-
<issueId value="MC-16684"/>
21-
</skip>
2219
</annotations>
2320

2421
<before>

‎app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CGuestUserTest.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="EndToEndB2CGuestUserTest">
12-
<annotations>
13-
<skip>
14-
<issueId value="MC-16684"/>
15-
</skip>
16-
</annotations>
1712
<before>
1813
<createData entity="ApiSalesRule" stepKey="createSalesRule"/>
1914
<createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">

‎app/code/Magento/SalesRule/Test/Mftf/Test/EndToEndB2CLoggedInUserTest.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
1010
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
1111
<test name="EndToEndB2CLoggedInUserTest">
12-
<annotations>
13-
<skip>
14-
<issueId value="MC-16684"/>
15-
</skip>
16-
</annotations>
1712
<before>
1813
<createData entity="ApiSalesRule" stepKey="createSalesRule"/>
1914
<createData entity="ApiSalesRuleCoupon" stepKey="createSalesRuleCoupon">

‎app/code/Magento/Tax/Test/Mftf/Test/AdminDeleteTaxRuleTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<group value="tax"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421

2522
<before>

‎app/code/Magento/Tax/Test/Mftf/Test/AdminUpdateTaxRuleWithFixedZipUtahTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<group value="tax"/>
1919
<group value="mtf_migrated"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421

2522
<before>

‎app/code/Magento/Tax/Test/Mftf/Test/StorefrontTaxQuoteCartTest.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-295"/>
1919
<group value="Tax"/>
20-
<skip>
21-
<issueId value="MC-16684"/>
22-
</skip>
2320
</annotations>
2421
<before>
2522
<actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>

0 commit comments

Comments
 (0)