Merge remote-tracking branch 'origin/2.4-develop' into MC-29047

Author: OlgaVasyltsun

app/code/Magento/Analytics/Test/Mftf/Test/AdminAdvancedReportingNavigateMenuTest.xml

@@ -30,6 +30,7 @@
             <argument name="submenuUiId" value="{{AdminMenuReportsBusinessIntelligenceAdvancedReporting.dataUiId}}"/>
         </actionGroup>
         <switchToNextTab stepKey="switchToNewTab"/>
+        <waitForPageLoad stepKey="waitForAdvancedReportingPageLoad"/>
         <seeInCurrentUrl url="advancedreporting.rjmetrics.com/report" stepKey="seeAssertAdvancedReportingPageUrl"/>
     </test>
 </tests>

app/code/Magento/AuthorizenetGraphQl/Model/AuthorizenetDataProvider.php

@@ -49,21 +49,6 @@ public function getData(array $data): array
                 __('Required parameter "authorizenet_acceptjs" for "payment_method" is missing.')
             );
         }
-        if (!isset($data[self::PATH_ADDITIONAL_DATA]['opaque_data_descriptor'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "opaque_data_descriptor" for "authorizenet_acceptjs" is missing.')
-            );
-        }
-        if (!isset($data[self::PATH_ADDITIONAL_DATA]['opaque_data_value'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "opaque_data_value" for "authorizenet_acceptjs" is missing.')
-            );
-        }
-        if (!isset($data[self::PATH_ADDITIONAL_DATA]['cc_last_4'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "cc_last_4" for "authorizenet_acceptjs" is missing.')
-            );
-        }
 
         $additionalData = $this->arrayManager->get(static::PATH_ADDITIONAL_DATA, $data);
         foreach ($additionalData as $key => $value) {

app/code/Magento/Backend/Test/Mftf/ActionGroup/AdminLogoutActionGroup.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminLogoutActionGroup">
+        <amOnPage url="{{AdminLogoutPage.url}}" stepKey="amOnLogoutPage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Test/AdminLoginAfterJSMinificationTest.xml

@@ -18,19 +18,18 @@
             <severity value="MAJOR"/>
             <group value="backend"/>
             <group value="mtf_migrated"/>
-            <skip>
-                <issueId value="MC-17140"/>
-            </skip>
         </annotations>
         <before>
             <magentoCLI command="config:set {{MinifyJavaScriptFilesEnableConfigData.path}} {{MinifyJavaScriptFilesEnableConfigData.value}}" stepKey="enableJsMinification"/>
+            <magentoCLI command="cache:clean config" stepKey="cleanCache"/>
             <actionGroup ref="LoginAsAdmin" stepKey="loginAsAdmin"/>
         </before>
         <after>
             <magentoCLI command="config:set {{MinifyJavaScriptFilesDisableConfigData.path}} {{MinifyJavaScriptFilesDisableConfigData.value}}" stepKey="disableJsMinification"/>
             <actionGroup ref="logout" stepKey="logout"/>
         </after>
-
+        <see userInput="Dashboard" selector="{{AdminHeaderSection.pageTitle}}" stepKey="seeDashboardTitle"/>
+        <waitForPageLoad stepKey="waitForPageLoadOnDashboard"/>
         <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="loggedInSuccessfully"/>
         <actionGroup ref="AssertAdminPageIsNot404ActionGroup" stepKey="dontSee404Page"/>
     </test>

app/code/Magento/Backend/view/adminhtml/layout/adminhtml_cache_block.xml

@@ -80,6 +80,7 @@
                             <argument name="type" xsi:type="string">options</argument>
                             <argument name="width" xsi:type="string">120</argument>
                             <argument name="align" xsi:type="string">left</argument>
+                            <argument name="sortable" xsi:type="string">0</argument>
                             <argument name="options" xsi:type="array">
                                 <item name="disabled" xsi:type="array">
                                     <item name="value" xsi:type="string">0</item>

app/code/Magento/BraintreeGraphQl/Model/BraintreeDataProvider.php

@@ -31,19 +31,6 @@ public function getData(array $args): array
                 __('Required parameter "braintree" for "payment_method" is missing.')
             );
         }
-
-        if (!isset($args[self::PATH_ADDITIONAL_DATA]['payment_method_nonce'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "payment_method_nonce" for "braintree" is missing.')
-            );
-        }
-
-        if (!isset($args[self::PATH_ADDITIONAL_DATA]['is_active_payment_token_enabler'])) {
-            throw new GraphQlInputException(
-                __('Required parameter "is_active_payment_token_enabler" for "braintree" is missing.')
-            );
-        }
-
         return $args[self::PATH_ADDITIONAL_DATA];
     }
 }

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontAdminEditDataTest.xml

@@ -79,7 +79,7 @@
         <waitForPageLoad stepKey="waitForElementAdded"/>
 
         <!-- Go to the shopping cart page and grab the value of the option title -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
         <waitForPageLoad stepKey="waitForCartPageLoad"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalBefore"/>
 
@@ -100,7 +100,7 @@
         <see stepKey="assertSuccess2" selector="{{AdminProductMessagesSection.successMessage}}" userInput="You saved the product."/>
 
         <!-- Go to the shopping cart page and make sure the title has changed -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart1"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart1"/>
         <waitForPageLoad stepKey="waitForCartPageLoad1"/>
         <grabTextFrom selector="{{CheckoutCartProductSection.nthBundleOptionName('1')}}" stepKey="grabTotalAfter"/>
         <assertNotEquals expected="{$grabTotalBefore}" expectedType="string" actual="{$grabTotalAfter}" actualType="string"  stepKey="assertNotEquals"/>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml

@@ -86,7 +86,7 @@
         <waitForPageLoad stepKey="waitForElementAdded2"/>
 
         <!-- Go to the shopping cart page and edit the first product -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart"/>
         <waitForPageLoad stepKey="waitForCartPageLoad"/>
         <waitForElementVisible stepKey="waitForInfoDropdown" selector="{{CheckoutCartSummarySection.total}}"/>
         <waitForPageLoad stepKey="waitForCartPageLoad3"/>
@@ -104,7 +104,7 @@
         <waitForPageLoad stepKey="waitForElementAdded3"/>
 
         <!-- Go to the shopping cart page -->
-        <amOnPage url="/checkout/cart/" stepKey="onPageShoppingCart2"/>
+        <amOnPage url="{{CheckoutCartPage.url}}" stepKey="onPageShoppingCart2"/>
         <waitForPageLoad stepKey="waitForCartPageLoad2"/>
 
         <!-- Assert that the options are both there and the proce no longer matches -->

app/code/Magento/Bundle/view/base/web/js/price-bundle.js

@@ -28,7 +28,8 @@ define([
         controlContainer: 'dd', // should be eliminated
         priceFormat: {},
         isFixedPrice: false,
-        optionTierPricesBlocksSelector: '#option-tier-prices-{1} [data-role="selection-tier-prices"]'
+        optionTierPricesBlocksSelector: '#option-tier-prices-{1} [data-role="selection-tier-prices"]',
+        isOptionsInitialized: false
     };
 
     $.widget('mage.priceBundle', {
@@ -53,20 +54,37 @@ define([
                 priceBox = $(this.options.priceBoxSelector, form),
                 qty = $(this.options.qtyFieldSelector, form);
 
-            if (priceBox.data('magePriceBox') &&
-                priceBox.priceBox('option') &&
-                priceBox.priceBox('option').priceConfig
-            ) {
-                if (priceBox.priceBox('option').priceConfig.optionTemplate) {
-                    this._setOption('optionTemplate', priceBox.priceBox('option').priceConfig.optionTemplate);
+            this._updatePriceBox();
+            priceBox.on('price-box-initialized', this._updatePriceBox.bind(this));
+            options.on('change', this._onBundleOptionChanged.bind(this));
+            qty.on('change', this._onQtyFieldChanged.bind(this));
+        },
+
+        /**
+         * Update price box config with bundle option prices
+         * @private
+         */
+        _updatePriceBox: function () {
+            var form = this.element,
+                options = $(this.options.productBundleSelector, form),
+                priceBox = $(this.options.priceBoxSelector, form);
+
+            if (!this.options.isOptionsInitialized) {
+                if (priceBox.data('magePriceBox') &&
+                    priceBox.priceBox('option') &&
+                    priceBox.priceBox('option').priceConfig
+                ) {
+                    if (priceBox.priceBox('option').priceConfig.optionTemplate) { //eslint-disable-line max-depth
+                        this._setOption('optionTemplate', priceBox.priceBox('option').priceConfig.optionTemplate);
+                    }
+                    this._setOption('priceFormat', priceBox.priceBox('option').priceConfig.priceFormat);
+                    priceBox.priceBox('setDefault', this.options.optionConfig.prices);
+                    this.options.isOptionsInitialized = true;
                 }
-                this._setOption('priceFormat', priceBox.priceBox('option').priceConfig.priceFormat);
-                priceBox.priceBox('setDefault', this.options.optionConfig.prices);
+                this._applyOptionNodeFix(options);
             }
-            this._applyOptionNodeFix(options);
 
-            options.on('change', this._onBundleOptionChanged.bind(this));
-            qty.on('change', this._onQtyFieldChanged.bind(this));
+            return this;
         },
 
         /**

app/code/Magento/Captcha/Test/Mftf/Section/CaptchaFormsDisplayingSection.xml

@@ -7,7 +7,7 @@
 -->
 
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:noNamespaceSchemaLocation="../../../../../../../vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd">
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="CaptchaFormsDisplayingSection">
         <element name="store" type="button" selector="#menu-magento-backend-stores"/>
         <element name="config" type="button" selector="//li[@data-ui-id='menu-magento-config-system-config']//span"/>