AC-3179: Fixing Mftf AdminLoginReCaptchaFunctionalityTest

Author: glo17680

ReCaptchaUser/Test/Mftf/ActionGroup/RecaptchaDisabledActionGroup.xml

@@ -10,17 +10,19 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="RecaptchaDisabledActionGroup">
         <annotations>
-            <description>Enable or disable admin login recaptcha</description>
+            <description>Disable admin login recaptcha</description>
         </annotations>
         <arguments>
             <argument name="optionValue" type="string" defaultValue="{{recaptchaFormDisabled.value}}"/>
         </arguments>
 
-        <amOnPage url="{{AdminStoreConfigurationPage.url}}" stepKey="navigateToAdminStoreConfiguration"/>
-        <scrollTo selector="{{RecaptchaFormSection.label}}" stepKey="scrollToDropdown" />
-        <click selector="{{RecaptchaFormSection.optionvalue}}" stepKey="clickedEnableForLogin"/>
-        <selectOption selector="{{RecaptchaFormSection.optionvalue}}" userInput="{{optionValue}}" stepKey="setValue"/>
-        <click selector="{{RecaptchaFormSection.saveConfig}}" stepKey="clickSave"/>
+        <amOnPage url="{{AdminStoreConfigurationPage.url}}" stepKey="navigateToAdminStoresConfiguration"/>
+        <conditionalClick selector="{{RecaptchaFormSection.adminblock}}" dependentSelector="{{RecaptchaFormSection.label}}" visible="false" stepKey="expand_panel"/>
+        <scrollTo selector="{{RecaptchaFormSection.label}}" stepKey="scroll_to_dropdown" />
+        <wait time="2" stepKey="wait_for_Load"/>
+        <checkOption selector="{{RecaptchaFormSection.useConfigSettings}}" stepKey="check_config_setting"/>
+        <wait time="2" stepKey="wait_for_load1"/>
+        <click selector="{{RecaptchaFormSection.saveConfig}}" stepKey="click_save"/>
 
     </actionGroup>
 </actionGroups>

ReCaptchaUser/Test/Mftf/ActionGroup/RecaptchaEnabledActionGroup.xml

@@ -10,17 +10,18 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="RecaptchaEnabledActionGroup">
         <annotations>
-            <description>Enable or disable admin login recaptcha</description>
+            <description>Enable admin login recaptcha</description>
         </annotations>
         <arguments>
             <argument name="optionValue" type="string" defaultValue="{{recaptchaForm.value}}"/>
         </arguments>
 
         <amOnPage url="{{AdminStoreConfigurationPage.url}}" stepKey="navigateToAdminStoreConfiguration"/>
+        <conditionalClick selector="{{RecaptchaFormSection.adminblock}}" dependentSelector="{{RecaptchaFormSection.label}}" visible="false" stepKey="expand_panel"/>
         <scrollTo selector="{{RecaptchaFormSection.label}}" stepKey="scrollToDropdownSelection" />
-        <wait time="3" stepKey="waitForColumnUpdateToSave"/>
+        <wait time="2" stepKey="waitForLoad"/>
         <uncheckOption selector="{{RecaptchaFormSection.useConfigSettings}}" stepKey="uncheckConfigSetting"/>
-        <wait time="3" stepKey="waitForColumnUpdateToSave1"/>
+        <wait time="2" stepKey="waitForLoad_1"/>
         <selectOption selector="{{RecaptchaFormSection.optionvalue}}" userInput="{{optionValue}}" stepKey="setAttributeValue"/>
         <click selector="{{RecaptchaFormSection.saveConfig}}" stepKey="clickSave"/>
 

ReCaptchaUser/Test/Mftf/Section/RecaptchaFormSection.xml

@@ -13,5 +13,6 @@
         <element name="saveConfig" type="button" selector="#save" timeout="30"/>
         <element name="label" type="input" selector="#row_recaptcha_backend_type_for_user_login"/>
         <element name="useConfigSettings" type="checkbox" selector="//input[@name='groups[type_for][fields][user_login][inherit]']"/>
+        <element name="adminblock" type="button" selector='a#recaptcha_backend_type_for-head'/>
     </section>
 </sections>

ReCaptchaUser/Test/Mftf/Test/AdminLoginReCaptchaFunctionalityTest.xml

@@ -20,9 +20,9 @@
         <before>
             <actionGroup ref="AdminLoginActionGroup" stepKey="login"/>
             <actionGroup ref="RecaptchaEnabledActionGroup" stepKey="recaptchaEnabled"/>
-<!--            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>-->
-<!--            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAgain11"/>-->
-<!--            <actionGroup ref="RecaptchaDisabledActionGroup" stepKey="recaptchaDisabled"/>-->
+            <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAgain11"/>
+            <actionGroup ref="RecaptchaDisabledActionGroup" stepKey="recaptchaDisabled"/>
         </before>
         <after>
             <actionGroup ref="AdminLogoutActionGroup" stepKey="logout"/>