Merge branch 'develop' into ds_fix-docs

Author: magento-devops-queue-mgr-svc

ReCaptchaUser/Test/Mftf/test-dependency-allowlist

@@ -0,0 +1,2 @@
+AdminLoginActionGroup
+AdminLogoutActionGroup

ReCaptchaUser/Test/Mftf/test-dependency-errors-detailed

@@ -0,0 +1,6 @@
+
+File "/var/www/html/app/code/Magento/ReCaptchaUser/Test/Mftf/Test/AdminLoginReCaptchaFunctionalityTest.xml"
+contains entity references that violate dependency constraints:
+		
+	 AdminLoginActionGroup from module(s): magento/module-admin-analytics, magento/module-backend, magento/module-two-factor-auth
+	 AdminLogoutActionGroup from module(s): magento/module-backend

TwoFactorAuth/Test/Mftf/ActionGroup/AdminSaveUserRoleActionGroup.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+/**
+* ADOBE CONFIDENTIAL
+*
+* Copyright 2023 Adobe
+* All Rights Reserved.
+*
+* NOTICE: All information contained herein is, and remains
+* the property of Adobe and its suppliers, if any. The intellectual
+* and technical concepts contained herein are proprietary to Adobe
+* and its suppliers and are protected by all applicable intellectual
+* property laws, including trade secret and copyright laws.
+* Dissemination of this information or reproduction of this material
+* is strictly forbidden unless prior written permission is obtained
+* from Adobe.
+*/
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminSaveUserRoleActionGroup">
+        <annotations>
+            <description>Merges with CE actionGroup. Adds steps to enable the 2FA ACL rule when creating a User Role.</description>
+        </annotations>
+        <waitForElementVisible selector="{{AdminEditRoleResourcesSection.resourceCheckboxLink('Magento_TwoFactorAuth::tfa', 'Two Factor Auth')}}" stepKey="waitFor2FACheckboxVisible" before="check2FAIfNotAlreadyChecked"/>
+        <conditionalClick selector="{{AdminEditRoleResourcesSection.resourceCheckboxLink('Magento_TwoFactorAuth::tfa', 'Two Factor Auth')}}" dependentSelector="{{AdminEditRoleResourcesSection.resourceCheckbox('Magento_TwoFactorAuth::tfa')}}" visible="false" stepKey="check2FAIfNotAlreadyChecked" before="see2FAChecked"/>
+        <seeElement selector="{{AdminEditRoleResourcesSection.resourceCheckbox('Magento_TwoFactorAuth::tfa')}}" stepKey="see2FAChecked" before="clickSaveRoleButton"/>
+    </actionGroup>
+</actionGroups>

TwoFactorAuth/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml

@@ -8,10 +8,7 @@
 <tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
     <test name="AdminReviewOrderWithReportsPermissionTest">
         <before>
-            <actionGroup ref="AdminChooseUserRoleResourceActionGroup" before="saveRole" stepKey="enableTfa">
-                <argument name="resourceId" value="Magento_TwoFactorAuth::tfa"/>
-                <argument name="resourceName" value="Two Factor Auth"/>
-            </actionGroup>
+            <comment userInput="BIC workaround" before="saveRole"  stepKey="enableTfa"/>
         </before>
     </test>
 </tests>

TwoFactorAuth/Test/Mftf/Test/AdminUpdateUserRoleTest.xml

@@ -15,10 +15,7 @@
             <severity value="AVERAGE"/>
         </annotations>
         <before>
-            <actionGroup ref="AdminChooseUserRoleResourceActionGroup" before="saveNewRole" stepKey="enableTfa">
-                <argument name="resourceId" value="Magento_TwoFactorAuth::tfa"/>
-                <argument name="resourceName" value="Two Factor Auth"/>
-            </actionGroup>
+            <comment userInput="BIC workaround" before="saveNewRole"  stepKey="enableTfa"/>
         </before>
     </test>
 </tests>