Merge branch '2.4-develop' into fallback-to-storelabels-customer-attributes

Author: swnsma

app/code/Magento/Backend/README.md

@@ -16,7 +16,6 @@ Before disabling or uninstalling this module, note that the following modules de
 - Magento_ReleaseNotification
 - Magento_Search
 - Magento_Security
-- Magento_Signifyd
 - Magento_Swatches
 - Magento_Ui
 - Magento_User

app/code/Magento/Braintree/Test/Mftf/Data/ConfigData.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<entities xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:noNamespaceSchemaLocation="urn:magento:mftf:DataGenerator/etc/dataProfileSchema.xsd">
+    <entity name="Enable3DSecureBraintree">
+        <data key="path">payment/braintree/verify_3dsecure</data>
+        <data key="value">1</data>
+    </entity>
+    <entity name="Disable3DSecureBraintree">
+        <data key="path">payment/braintree/verify_3dsecure</data>
+        <data key="value">0</data>
+    </entity>
+    <entity name="DisableVaultBraintree">
+        <data key="path">payment/braintree_cc_vault/active</data>
+        <data key="value">0</data>
+    </entity>
+</entities>

app/code/Magento/Catalog/Test/Mftf/ActionGroup/AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup.xml

@@ -0,0 +1,22 @@
+<?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="AssertStorefrontProductImageAppearsOnProductPagePreviewActionGroup">
+        <annotations>
+            <description>Validate that the Product Image is present on preview and correct on frontend product page.</description>
+        </annotations>
+        <arguments>
+            <argument name="productImage" type="string" defaultValue="{{MagentoLogo.file}}"/>
+        </arguments>
+
+        <waitForElementNotVisible selector="{{StorefrontProductMediaSection.gallerySpinner}}" stepKey="waitGallerySpinnerDisappear"/>
+        <seeElement selector="{{StorefrontProductMediaSection.gallery}}" stepKey="seeProductGallery"/>
+        <seeElement selector="{{StorefrontProductMediaSection.productImageActive(productImage)}}" stepKey="seeCorrectProductImage"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Checkout/Test/Mftf/ActionGroup/PlaceOrderWithLoggedUserActionGroup.xml

@@ -17,6 +17,8 @@
             <argument name="shippingMethod" defaultValue="" type="string"/>
         </arguments>
 
+        <waitForLoadingMaskToDisappear stepKey="waitForCartTotalsLoaded"/>
+        <waitForElementVisible selector="{{CheckoutCartSummarySection.orderTotal}}" stepKey="waitForCartGrandTotalVisible"/>
         <waitForElementVisible selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="waitProceedToCheckout"/>
         <click selector="{{CheckoutCartSummarySection.proceedToCheckout}}" stepKey="clickProceedToCheckout"/>
         <click selector="{{CheckoutShippingMethodsSection.checkShippingMethodByName('shippingMethod')}}" stepKey="selectShippingMethod"/>

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontGalleryConfigurableProductWithSeveralAttributesTest.xml renamed to app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontGalleryConfigurableProductWithSeveralAttributesPrependMediaTest.xml

@@ -27,6 +27,8 @@ class SmartButton extends Template implements ShortcutInterface
 {
     private const ALIAS_ELEMENT_INDEX = 'alias';
 
+    const PAYPAL_BUTTON_ID = 'paypal-express-in-context-checkout-main';
+
     /**
      * @var Config
      */

app/code/Magento/ConfigurableProduct/Test/Mftf/Test/StorefrontGalleryConfigurableProductWithVisualSwatchAttributePrependMediaTest.xml

@@ -3,12 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-use Magento\Paypal\Block\Express\InContext\Minicart\Button;
+use Magento\Paypal\Block\Express\InContext\Minicart\SmartButton;
 
 /** @var \Magento\Paypal\Block\Express\InContext\Component $block */
 
 $configuration = [
-    'id' => Button::PAYPAL_BUTTON_ID,
+    'id' => SmartButton::PAYPAL_BUTTON_ID,
     'path' => $block->getUrl(
         'paypal/express/gettoken',
         [
@@ -21,17 +21,18 @@ $configuration = [
         'locale' => $block->getLocale(),
         'environment' => $block->getEnvironment(),
         'button' => [
-            Button::PAYPAL_BUTTON_ID,
+            SmartButton::PAYPAL_BUTTON_ID,
         ]
     ]
 ];
 
 ?>
-<div style="display: none;" id="<?= /* @noEscape */ Button::PAYPAL_BUTTON_ID ?>"></div>
+<div style="display: none;" id="<?= /* @noEscape */ SmartButton::PAYPAL_BUTTON_ID ?>"></div>
 <script type="text/x-magento-init">
     {
         "*": {
-            "Magento_Paypal/js/in-context/express-checkout": <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
+            "Magento_Paypal/js/in-context/express-checkout":
+            <?= /* @noEscape */ $this->helper(\Magento\Framework\Json\Helper\Data::class)->jsonEncode($configuration) ?>
         }
     }
 </script>

app/code/Magento/InstantPurchase/Test/Mftf/Test/StorefrontInstantPurchaseFunctionalityNegativeScenarioTest.xml

@@ -13,4 +13,9 @@
         <data key="videoTitle">Arctic Monkeys - Do I Wanna Know? (Official Video)</data>
         <data key="videoShortTitle">Arctic Monkeys</data>
     </entity>
+    <entity name="VimeoProductVideo" type="product_video">
+        <data key="videoUrl">https://vimeo.com/76979871</data>
+        <data key="videoTitle">The New Vimeo Player (You Know, For Videos)</data>
+        <data key="videoShortTitle">The New Vimeo Player</data>
+    </entity>
 </entities>