Merge pull request #60 from magento-trigger/AC-107

[Trigger] jsTree Upgrade

Author: krissyhiserote

TwoFactorAuth/Test/Mftf/ActionGroup/AdminCreateRoleActionGroup.xml

@@ -8,8 +8,8 @@
 <actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateRoleActionGroup">
-        <waitForElementVisible stepKey="waitForTfaRole" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" time="30" after="clickContentBlockCheckbox"/>
-        <conditionalClick visible="false" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
+        <waitForElementVisible stepKey="waitForTfaRole" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" time="30" after="clickContentBlockCheckbox" />
+        <conditionalClick visible="true" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
     </actionGroup>
 </actionGroups>
 

TwoFactorAuth/Test/Mftf/ActionGroup/AdminCreateUserRoleWithReportsActionGroup.xml

@@ -9,7 +9,7 @@
               xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
     <actionGroup name="AdminCreateUserRoleWithReportsActionGroup">
         <waitForElementVisible stepKey="waitForTfaRole" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" time="30" after="checkReports"/>
-        <conditionalClick visible="false" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
+        <conditionalClick visible="true" dependentSelector="{{AdminEditRoleInfoSection.uncheckedCheckboxByRole('Magento_TwoFactorAuth::tfa')}}" stepKey="clickCheckbox" selector="{{AdminEditRoleInfoSection.checkboxByRole('Magento_TwoFactorAuth::tfa')}}" after="waitForTfaRole"/>
     </actionGroup>
 </actionGroups>
 

TwoFactorAuth/Test/Mftf/Section/AdminEditRoleInfoSection.xml

@@ -7,7 +7,7 @@
 -->
 <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
     <section name="AdminEditRoleInfoSection">
-        <element name="checkboxByRole" type="checkbox" selector="//*[@value='{{var}}']/parent::*//*[@class='jstree-checkbox']" parameterized="true"/>
-        <element name="uncheckedCheckboxByRole" type="checkbox" selector="//*[@data-id='{{var}}' and contains(@class, 'jstree-checked')]" parameterized="true"/>
+        <element name="checkboxByRole" type="checkbox" selector="//li[@data-id='{{var}}']/a/i[contains(@class, 'jstree-checkbox')]" parameterized="true"/>
+        <element name="uncheckedCheckboxByRole" type="checkbox" selector="//li[@data-id='{{var}}']/a[@aria-selected='false']/i[contains(@class, 'jstree-checkbox')]" parameterized="true"/>
     </section>
 </sections>