merge magento/2.4-develop into magento-tsg/2.4-develop-pr18

Author: magento-mts-svc

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

@@ -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>

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

@@ -24,4 +24,12 @@
         <requiredEntity type="StoreLabel">Option2Store0</requiredEntity>
         <requiredEntity type="StoreLabel">Option2Store1</requiredEntity>
     </entity>
+    <entity name="SwatchProductAttributeOption3" type="ProductSwatchAttributeOption">
+        <var key="attribute_code" entityKey="attribute_code" entityType="ProductAttribute"/>
+        <data key="label" unique="suffix">swatch-option3-</data>
+        <data key="is_default">true</data>
+        <data key="sort_order">2</data>
+        <requiredEntity type="StoreLabel">Option3Store0</requiredEntity>
+        <requiredEntity type="StoreLabel">Option3Store1</requiredEntity>
+    </entity>
 </entities>