Merge branch '2.4-develop-mainline' into elastic_spike

Author: irenelagno

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

@@ -53,13 +53,13 @@
         <data key="value">sandbox</data>
     </entity>
     <entity name="MerchantId" type="merchant_id">
-        <data key="value">MERCH_ID</data>
+        <data key="value">{{_CREDS.magento/braintree_enabled_fraud_merchant_id}}</data>
     </entity>
     <entity name="PublicKey" type="public_key">
-        <data key="value">PUBLIC_KEY</data>
+        <data key="value">{{_CREDS.magento/braintree_enabled_fraud_public_key}}</data>
     </entity>
     <entity name="PrivateKey" type="private_key">
-        <data key="value">PRIVATE_KEY</data>
+        <data key="value">{{_CREDS.magento/braintree_enabled_fraud_private_key}}</data>
     </entity>
 
     <!-- default configuration used to restore Magento config -->
@@ -141,6 +141,16 @@
         <data key="cardNumberEnding">5100</data>
         <data key="cardExpire">12/2020</data>
     </entity>
+    <entity name="VisaDefaultCard" type="data">
+        <data key="cardNumber">4111111111111111</data>
+        <data key="month">01</data>
+        <data key="year">30</data>
+        <data key="cvv">123</data>
+    </entity>
+    <entity name="VisaDefaultCardInfo">
+        <data key="cardNumberEnding">1111</data>
+        <data key="cardExpire">01/2030</data>
+    </entity>
 
     <entity name="BraintreeConfigurationData" type="data">
         <data key="title">Credit Card (Braintree)</data>

app/code/Magento/Bundle/Test/Mftf/Test/AdminAddBundleItemsTest.xml

@@ -14,7 +14,7 @@
             <stories value="Create/Edit bundle product in Admin"/>
             <title value="Admin should be able to add/edit bundle items when creating/editing a bundle product"/>
             <description value="Admin should be able to add/edit bundle items when creating/editing a bundle product"/>
-            <severity value="MAJOR"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-223"/>
             <group value="Bundle"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/AdminAssociateBundleProductToWebsitesTest.xml

@@ -15,7 +15,7 @@
             <title value="Admin should be able to associate bundle product to websites"/>
             <description value="Admin should be able to associate bundle product to websites"/>
             <testCaseId value="MC-3344"/>
-            <severity value="CRITICAL"/>
+            <severity value="BLOCKER"/>
             <group value="bundle"/>
             <group value="catalog"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/AdminProductBundleCreationTest.xml

@@ -14,7 +14,7 @@
             <stories value="Create/Edit bundle product in Admin"/>
             <title value="Admin should be able to save and publish a bundle product"/>
             <description value="Admin should be able to save and publish a bundle product"/>
-            <severity value="CRITICAL"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-225"/>
             <group value="Bundle"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/BundleProductFixedPricingTest.xml

@@ -14,7 +14,7 @@
             <stories value="Bundle Product Pricing"/>
             <title value="Admin should be able to apply fixed pricing for Bundled Product"/>
             <description value="Admin should be able to apply fixed pricing for Bundled Product"/>
-            <severity value="CRITICAL"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-186"/>
             <group value="Bundle"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/CurrencyChangingBundleProductInCartTest.xml

@@ -13,7 +13,7 @@
                 <stories value="Check that after changing currency price of cart is correct when the bundle product added to the cart"/>
                 <title value="User should be able change the currency and get right price in cart when the bundle product added to the cart"/>
                 <description value="User should be able change the currency and add one more product in cart and get right price in previous currency"/>
-                <severity value="MAJOR"/>
+                <severity value="BLOCKER"/>
                 <testCaseId value="MAGETWO-94467"/>
                 <group value="Bundle"/>
             </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductDetailsTest.xml

@@ -14,7 +14,7 @@
             <stories value="Bundle product details page"/>
             <title value="Customer should be able to see basic bundle product details"/>
             <description value="Customer should be able to see basic bundle product details"/>
-            <severity value="CRITICAL"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-230"/>
             <group value="Bundle"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontBundleProductShownInCategoryListAndGridTest.xml

@@ -14,7 +14,7 @@
             <stories value="Bundle products list on Storefront"/>
             <title value="Customer should be able to see bundle products in the category products list and grid views"/>
             <description value="Customer should be able to see bundle products in the category products list and grid views"/>
-            <severity value="CRITICAL"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-226"/>
             <group value="Bundle"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontEditBundleProductTest.xml

@@ -14,7 +14,7 @@
             <stories value="Bundle products list on Storefront"/>
             <title value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
             <description value="Customer should be able to change chosen options for Bundle Product when clicking Edit button in Shopping Cart page"/>
-            <severity value="MAJOR"/>
+            <severity value="BLOCKER"/>
             <testCaseId value="MC-290"/>
             <group value="Bundle"/>
         </annotations>

app/code/Magento/Bundle/Test/Mftf/Test/StorefrontSpecialPriceBundleProductInCartTest.xml

@@ -13,7 +13,7 @@
                 <stories value="Add bundle product to cart on storefront"/>
                 <title value="Customer should not be able to add a Bundle Product to the cart when added a special price for associated products"/>
                 <description value="Customer should not be able to add a Bundle Product to the cart when added a special price for associated products"/>
-                <severity value="MAJOR"/>
+                <severity value="BLOCKER"/>
                 <testCaseId value="MC-19134"/>
                 <useCaseId value="MC-18963"/>
                 <group value="bundle"/>