Skip to content

Commit 2cb86cb

Browse files
sidolovsidolov
authored
Merge branch '2.3-develop' into 2.3-bugfix/disable_sort_visibility_issue24105
2 parents da8766f + 421f825 commit 2cb86cb

File tree

110 files changed

+1524
-424
lines changed

Some content is hidden

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

110 files changed

+1524
-424
lines changed

‎app/code/Magento/Backend/Block/AbstractBlock.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class AbstractBlock extends \Magento\Framework\View\Element\AbstractBlock
2727
*/
2828
public function __construct(\Magento\Backend\Block\Context $context, array $data = [])
2929
{
30-
parent::__construct($context, $data);
3130
$this->_authorization = $context->getAuthorization();
31+
parent::__construct($context, $data);
3232
}
3333
}

‎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>

0 commit comments

Comments
 (0)