merge magento/2.4-develop into magento-engcom/banned-words-plus-asset-fields

Author: magento-mts-svc

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontCheckNoAppearDefaultOptionConfigurableProductTest.xml

@@ -14,6 +14,7 @@
             <title value="Check for Configurable Product the default option doesn't appear."/>
             <description value="Check for Configurable Product the default option doesn't appear on the list options product when an option use."/>
             <testCaseId value="MC-35074"/>
+            <severity value="CRITICAL"/>
         </annotations>
         <before>
             <createData entity="ApiCategory" stepKey="createCategory"/>

app/code/Magento/Customer/Test/Mftf/ActionGroup/CreateCustomerOrderActionGroup.xml

@@ -12,10 +12,6 @@
         <annotations>
             <description>Create Order via API assigned to Customer.</description>
         </annotations>
-        <arguments>
-            <argument name="Customer" />
-            <argument name="Product" />
-        </arguments>
 
         <createData entity="CustomerCart" stepKey="CustomerCart">
             <requiredEntity createDataKey="Customer"/>

app/code/Magento/Downloadable/Test/Mftf/Test/AdminCreateDownloadableProductWithInvalidDomainLinkUrlTest.xml

@@ -37,7 +37,7 @@
             <argument name="link" value="downloadableLink"/>
             <argument name="index" value="0"/>
         </actionGroup>
-        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductAfterAddingDomainToWhitelist" after="addDownloadableProductLinkAgain" />
+        <actionGroup ref="SaveProductFormActionGroup" stepKey="saveProductAfterAddingDomainToAllowlist" after="addDownloadableProductLinkAgain" />
         <scrollTo selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="scrollToLinks"/>
         <click selector="{{StorefrontDownloadableProductSection.downloadableLinkByTitle(downloadableLink.title)}}" stepKey="selectProductLink"/>
         <see selector="{{CheckoutCartProductSection.ProductPriceByName(DownloadableProduct.name)}}" userInput="$52.99" stepKey="assertProductPriceInCart"/>

app/code/Magento/Wishlist/Test/Mftf/Test/StorefrontShareWishlistWithNotValidEmailAddressTest.xml

@@ -14,6 +14,7 @@
             <stories value="Customer Wishlist"/>
             <title value="Customer is not able to share wishlist with invalid email addresses"/>
             <description value="Customer is not able to share wishlist with invalid email addresses"/>
+            <severity value="AVERAGE"/>
             <group value="wishlist"/>
         </annotations>
         <before>

composer.json

@@ -88,7 +88,7 @@
         "friendsofphp/php-cs-fixer": "~2.16.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "3.0.0-RC4",
+        "magento/magento2-functional-testing-framework": "3.0.0-RC5",
         "pdepend/pdepend": "~2.7.1",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "^2.8.0",