Skip to content

Commit 524f164

Browse files
authored
Merge pull request #5864 from magento-tsg/2.4.0-develop-pr64
[TSG] Fixes for 2.4 (pr64) (2.4.0-develop)
2 parents ab5120a + f191453 commit 524f164

File tree

6 files changed

+12
-4
lines changed

6 files changed

+12
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ $scriptString = <<<script
1818
releaseVisible: {$isReleaseVisible},
1919
}
2020
});
21-
script
21+
script;
2222
?>
2323

2424
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ $numColumns = $block->getColumns() !== null ? count($block->getColumns()): 0;
188188
$scriptString .= 'deps.push(\'mage/adminhtml/grid\');' . PHP_EOL;
189189

190190
$scriptString .= '
191-
require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL .'
192-
//TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed' . PHP_EOL;
191+
require(deps, function('. ($block->getDependencyJsObject() ? 'registry' : '') .'){' . PHP_EOL;
192+
//TODO: getJsObjectName and getRowClickCallback has unexpected behavior. Should be removed
193193
if ($block->getDependencyJsObject()) {
194194
$scriptString .= 'registry.get(\'' . $block->escapeJs($block->getDependencyJsObject()) .
195195
'\', function ('. $block->escapeJs($block->getDependencyJsObject()) . ') {' . PHP_EOL;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,6 @@
7575
<?= $_fileExists ?
7676
/* @noEscape */ $secureRenderer->renderStyleAsTag(
7777
'display:none',
78-
'input-box-' . /* @noEscape */ $_fileName
78+
'#input-box-' . /* @noEscape */ $_fileName
7979
) : '' ?>
8080
</div>

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="CRITICAL"/>
1818
<testCaseId value="MC-13690"/>
1919
<group value="paypalExpress"/>
20+
<skip>
21+
<issueId value="MC-35722"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<!-- Login -->

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
<severity value="MAJOR"/>
1818
<testCaseId value="MC-33274"/>
1919
<group value="paypalExpress"/>
20+
<skip>
21+
<issueId value="MC-35722"/>
22+
</skip>
2023
</annotations>
2124
<before>
2225
<!--Set price scope global-->

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
<argument name="option"/>
1919
</arguments>
2020

21+
<scrollToTopOfPage stepKey="scrollToTopOfThePage"/>
22+
<waitForElementVisible selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="waitForAddProductsButton"/>
2123
<click selector="{{AdminOrderFormItemsSection.addProducts}}" stepKey="clickAddProducts"/>
2224
<fillField selector="{{AdminOrderFormItemsSection.skuFilter}}" userInput="{{product.sku}}" stepKey="fillSkuFilterConfigurable"/>
2325
<click selector="{{AdminOrderFormItemsSection.search}}" stepKey="clickSearchConfigurable"/>

0 commit comments

Comments
 (0)