merge magento/2.4.0-develop into magento-tsg/MC-35197

magento-mts-svc · web-flow · commit 7d7aa645e4f0 · 2020-06-17T02:52:06.000-07:00
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/tabs.phtml
@@ -31,7 +31,7 @@
             <?php $_tabHref = $block->getTabUrl($_tab) == '#' ? '#' . $block->getTabId($_tab) . '_content' :
                 $block->getTabUrl($_tab) ?>
 
-            <li class="admin__page-nav-item" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
+            <li class="admin__page-nav-item no-display" id="<?= $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
                 <?= /* @noEscape */ $block->getUiId('tab', 'item', $_tab->getId()) ?>>
                 <a href="<?=  $block->escapeUrl($_tabHref) ?>"
                    id="<?=  $block->escapeHtmlAttr($block->getTabId($_tab)) ?>"
@@ -72,17 +72,27 @@
                     <?= /* @noEscape */ $block->getUiId('tab', 'content', $_tab->getId()) ?>>
                     <?= /* @noEscape */ $block->getTabContent($_tab) ?>
                 </div>
-                <?php if ($block->getTabIsHidden($_tab)): ?>
-                    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
-                        'display:none',
-                        'li.admin__page-nav-item#' . $block->escapeJs($block->getTabId($_tab))
-                    ); ?>
-                <?php endif; ?>
                 <?= /* @noEscape */ $secureRenderer->renderStyleAsTag(
                     'display:none',
                     'div#' . $block->escapeJs($block->getTabId($_tab)) . '_content'
                 ); ?>
             </li>
+            <?php $scriptString = <<<script
+    require(['jquery'], function($){
+        'use strict';
+script;
+            if ($block->getTabIsHidden($_tab)):
+                $scriptString .= <<<script
+        $('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').css('display', 'none');
+script;
+            endif;
+
+            $scriptString .= <<<script
+        $('li.admin__page-nav-item#{$block->escapeJs($block->getTabId($_tab))}').removeClass('no-display');
+    })
+script;
+            ?>
+            <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false) ?>
         <?php endforeach; ?>
     </ul>
 </div>
diff --git a/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml b/app/code/Magento/Checkout/view/frontend/templates/total/default.phtml
@@ -39,5 +39,7 @@ $checkoutHelper = $block->getData('checkoutHelper');
         <?php endif; ?>
     </td>
 </tr>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
-<?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
+<?php if ($block->getTotal()->getStyle()): ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals th.mark') ?>
+    <?= /* @noEscape */ $secureRenderer->renderStyleAsTag($block->getTotal()->getStyle(), 'tr.totals td.amount') ?>
+<?php endif; ?>
diff --git a/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml b/app/code/Magento/Customer/view/frontend/templates/account/authentication-popup.phtml
@@ -9,7 +9,7 @@
 ?>
 <div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">
     <?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>
-    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;
+    <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
     <!-- ko template: getTemplate() --><!-- /ko -->
     <script type="text/x-magento-init">
         {
diff --git a/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml b/app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml
@@ -37,7 +37,7 @@
             <argument name="link" value="downloadableLink"/>
             <argument name="index" value="0"/>
         </actionGroup>
-        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductAfterAddingDomainToWhitelist" after="addDownloadableProductLinkAgain" />
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductAfterAddingDomainToAllowlist" after="addDownloadableProductLinkAgain" />
         <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="scrollToLinks"/>
         <click selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="selectProductLink"/>
         <see selector="{{CheckoutCartProductSection.ProductPriceByName(DownloadableProduct.name)}}" userInput="$52.99" stepKey="assertProductPriceInCart"/>
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup.xml
@@ -9,7 +9,6 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup">
         <arguments>
-            <argument name="payerName" defaultValue="MPI" type="string"/>
             <argument name="credentials" defaultValue="_CREDS"/>
         </arguments>
         <!--Check in-context-->
diff --git a/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentFromCartActionGroup.xml b/app/code/Magento/Paypal/Test/Mftf/ActionGroup/StorefrontLoginToPayPalPaymentFromCartActionGroup.xml
@@ -8,7 +8,10 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="StorefrontLoginToPayPalPaymentFromCartAccountActionGroup" extends="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup">
+        <arguments>
+            <argument name="payerName" defaultValue="MPI" type="string"/>
+        </arguments>
         <seeElement selector="{{PayPalCheckoutAsGuestSection.CreditDebitBtn}}" stepKey="assertCheckoutAsGuest" before="waitForLoginForm"/>
-        <see userInput="{{payerName}}" selector="{{PayPalPaymentSection.userName}}" stepKey="seePayerName"/>
+        <see userInput="{{payerName}}" selector="{{PayPalPaymentSection.userName}}" stepKey="seePayerName" after="assertCheckoutAsGuest"/>
     </actionGroup>
 </actionGroups>
diff --git a/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml b/app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInProductPageTest.xml
@@ -79,9 +79,8 @@
         <actionGroup ref="SwitchToPayPalGroupBtnActionGroup" stepKey="clickPayPalBtn"/>
 
         <!--Login to Paypal in-context-->
-        <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="LoginToPayPal">
-            <argument name="payerName" value="{{Payer.firstName}}"/>
-        </actionGroup>
+        <actionGroup ref="StorefrontLoginToPayPalPaymentAccountTwoStepActionGroup" stepKey="LoginToPayPal"/>
+
         <!--Transfer Cart Line and Shipping Method assertion-->
         <actionGroup ref="PayPalAssertTransferLineAndShippingMethodNotExistActionGroup" stepKey="assertPayPalSettings"/>
 
diff --git a/app/code/Magento/Ui/view/base/web/js/block-loader.js b/app/code/Magento/Ui/view/base/web/js/block-loader.js
@@ -15,14 +15,18 @@ define([
         blockContentLoadingClass = '_block-content-loading',
         blockLoader,
         blockLoaderClass,
-        loaderImageHref;
+        blockLoaderElement = $.Deferred(),
+        loaderImageHref = $.Deferred();
 
     templateLoader.loadTemplate(blockLoaderTemplatePath).done(function (blockLoaderTemplate) {
-        blockLoader = template($.trim(blockLoaderTemplate), {
-            loaderImageHref: loaderImageHref
+        loaderImageHref.done(function (loaderHref) {
+            blockLoader = template($.trim(blockLoaderTemplate), {
+                loaderImageHref: loaderHref
+            });
+            blockLoader = $(blockLoader);
+            blockLoaderClass = '.' + blockLoader.attr('class');
+            blockLoaderElement.resolve();
         });
-        blockLoader = $(blockLoader);
-        blockLoaderClass = '.' + blockLoader.attr('class');
     });
 
     /**
@@ -70,7 +74,7 @@ define([
     }
 
     return function (loaderHref) {
-        loaderImageHref = loaderHref;
+        loaderImageHref.resolve(loaderHref);
         ko.bindingHandlers.blockLoader = {
             /**
              * Process loader for block
@@ -81,9 +85,9 @@ define([
                 element = $(element);
 
                 if (ko.unwrap(displayBlockLoader())) {
-                    addBlockLoader(element);
+                    blockLoaderElement.done(addBlockLoader(element));
                 } else {
-                    removeBlockLoader(element);
+                    blockLoaderElement.done(removeBlockLoader(element));
                 }
             }
         };
diff --git a/composer.json b/composer.json
@@ -64,7 +64,7 @@
         "laminas/laminas-uri": "^2.5.1",
         "laminas/laminas-validator": "^2.6.0",
         "laminas/laminas-view": "~2.11.2",
-        "magento/composer": "1.6.x-dev",
+        "magento/composer": "1.6.0",
         "magento/magento-composer-installer": ">=0.1.11",
         "magento/zendframework1": "~1.14.2",
         "monolog/monolog": "^1.17",
@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.16.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "3.0.0-RC4",
+        "magento/magento2-functional-testing-framework": "3.0.0-RC5",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Ui/base/js/block-loader.test.js

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`	`?>`
`10`	`10`	`<div id="authenticationPopup" data-bind="scope:'authenticationPopup', style: {display: 'none'}">`
`11`	`11`	`<?php $scriptString = 'window.authenticationPopup = ' . /* @noEscape */ $block->getSerializedConfig(); ?>`
`12`		`- <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>;`
	`12`	`+ <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>`
`13`	`13`	`<!-- ko template: getTemplate() --><!-- /ko -->`
`14`	`14`	`<script type="text/x-magento-init">`
`15`	`15`	`{`