Merge pull request #5864 from magento-tsg/2.4.0-develop-pr64

[TSG] Fixes for 2.4 (pr64) (2.4.0-develop)

Author: zakdma

app/code/Magento/AdminAnalytics/view/adminhtml/templates/notification.phtml

@@ -18,7 +18,7 @@ $scriptString = <<<script
             releaseVisible: {$isReleaseVisible},
         }
     });
-script
+script;
 ?>
 
 <?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>

app/code/Magento/Backend/view/adminhtml/templates/widget/grid.phtml

@@ -188,8 +188,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
         $scriptString .= 'deps.push(\'mage/adminhtml/grid\');' . PHP_EOL;
 
         $scriptString .= '
-require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL .'
-        //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed' . PHP_EOL;
+require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL;
+        //TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed
         if ($block->getDependencyJsObject()) {
             $scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
                 '\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;

app/code/Magento/Catalog/view/frontend/templates/product/view/options/type/file.phtml

@@ -75,6 +75,6 @@
     <?= $_fileExists ?
         /* @noEscape */ $secureRenderer->renderStyleAsTag(
             'display:none',
-            'input-box-' . /* @noEscape */ $_fileName
+            '#input-box-' . /* @noEscape */ $_fileName
         ) : '' ?>
 </div>

app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonInCheckoutPageTest.xml

@@ -17,6 +17,9 @@
             <severity value="CRITICAL"/>
             <testCaseId value="MC-13690"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-35722"/>
+            </skip>
         </annotations>
         <before>
             <!-- Login -->

app/code/Magento/Paypal/Test/Mftf/Test/StorefrontPaypalSmartButtonWithFranceMerchantCountryTest.xml

@@ -17,6 +17,9 @@
             <severity value="MAJOR"/>
             <testCaseId value="MC-33274"/>
             <group value="paypalExpress"/>
+            <skip>
+                <issueId value="MC-35722"/>
+            </skip>
         </annotations>
         <before>
             <!--Set price scope global-->

app/code/Magento/Sales/Test/Mftf/ActionGroup/AddConfigurableProductToOrderActionGroup.xml

@@ -18,6 +18,8 @@
             <argument name="option"/>
         </arguments>
 
+        <scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
+        <waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitForAddProductsButton"/>
         <click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
         <fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterConfigurable"/>
         <click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchConfigurable"/>