Skip to content

Commit 69f990a

Browse files
admanesachinadmanesachin
authored
Merge branch 'develop' into u2f-error
2 parents 9df7c16 + 7db1012 commit 69f990a

File tree

7 files changed

+52
-13
lines changed

7 files changed

+52
-13
lines changed

‎.github/CONTRIBUTING.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ For more detailed information on contribution please read our [beginners guide](
1919
2. Pull requests (PRs) must be accompanied by a meaningful description of their purpose. Comprehensive descriptions increase the chances of a pull request being merged quickly and without additional clarification requests.
2020
3. Commits must be accompanied by meaningful commit messages. Please see the [Magento Pull Request Template](https://github.com/magento/magento2/blob/2.3-develop/.github/PULL_REQUEST_TEMPLATE.md) for more information.
2121
4. PRs which include bug fixes must be accompanied with a step-by-step description of how to reproduce the bug.
22-
3. PRs which include new logic or new features must be submitted along with:
23-
* Unit/integration test coverage
24-
* Proposed [documentation](https://devdocs.magento.com) updates. Documentation contributions can be submitted via the [devdocs GitHub](https://github.com/magento/devdocs).
25-
4. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
26-
5. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
22+
5. PRs which include new logic or new features must be submitted along with:
23+
* Unit/integration test coverage
24+
* Proposed [documentation](https://developer.adobe.com/commerce) updates. Use feedback buttons __Edit in GitHub__ and __Log an issue__ at the top of a relevant topic.
25+
6. For larger features or changes, please [open an issue](https://github.com/magento/magento2/issues) to discuss the proposed changes prior to development. This may prevent duplicate or unnecessary effort and allow other contributors to provide input.
26+
7. All automated tests must pass (all builds on [Travis CI](https://travis-ci.org/magento/magento2) must be green).
2727

2828
## Contribution process
2929

‎ReCaptchaFrontendUi/view/frontend/web/js/reCaptcha.js‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,13 @@ define(
160160
grecaptcha.execute(widgetId);
161161
event.preventDefault(event);
162162
event.stopImmediatePropagation();
163+
if (this.$parentForm.valid()) {
164+
let formSubmitButton = this.$parentForm.find('button:not([type]), [type=submit]');
165+
166+
if (formSubmitButton.length) { //eslint-disable-line max-depth
167+
formSubmitButton.attr('disabled', true);
168+
}
169+
}
163170
}
164171
}.bind(this));
165172

‎ReCaptchaUser/Test/Mftf/test-dependency-allowlist‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
AdminLoginActionGroup
2+
AdminLogoutActionGroup

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
2+
File "/var/www/html/app/code/Magento/ReCaptchaUser/Test/Mftf/Test/AdminLoginReCaptchaFunctionalityTest.xml"
3+
contains entity references that violate dependency constraints:
4+
5+
AdminLoginActionGroup from module(s): magento/module-admin-analytics, magento/module-backend, magento/module-two-factor-auth
6+
AdminLogoutActionGroup from module(s): magento/module-backend

‎TwoFactorAuth/Test/Mftf/ActionGroup/AdminSaveUserRoleActionGroup.xml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* ADOBE CONFIDENTIAL
5+
*
6+
* Copyright 2023 Adobe
7+
* All Rights Reserved.
8+
*
9+
* NOTICE: All information contained herein is, and remains
10+
* the property of Adobe and its suppliers, if any. The intellectual
11+
* and technical concepts contained herein are proprietary to Adobe
12+
* and its suppliers and are protected by all applicable intellectual
13+
* property laws, including trade secret and copyright laws.
14+
* Dissemination of this information or reproduction of this material
15+
* is strictly forbidden unless prior written permission is obtained
16+
* from Adobe.
17+
*/
18+
-->
19+
20+
<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
22+
<actionGroup name="AdminSaveUserRoleActionGroup">
23+
<annotations>
24+
<description>Merges with CE actionGroup. Adds steps to enable the 2FA ACL rule when creating a User Role.</description>
25+
</annotations>
26+
<waitForElementVisible selector="{{AdminEditRoleResourcesSection.resourceCheckboxLink('Magento_TwoFactorAuth::tfa', 'Two Factor Auth')}}" stepKey="waitFor2FACheckboxVisible" before="check2FAIfNotAlreadyChecked"/>
27+
<conditionalClick selector="{{AdminEditRoleResourcesSection.resourceCheckboxLink('Magento_TwoFactorAuth::tfa', 'Two Factor Auth')}}" dependentSelector="{{AdminEditRoleResourcesSection.resourceCheckbox('Magento_TwoFactorAuth::tfa')}}" visible="false" stepKey="check2FAIfNotAlreadyChecked" before="see2FAChecked"/>
28+
<seeElement selector="{{AdminEditRoleResourcesSection.resourceCheckbox('Magento_TwoFactorAuth::tfa')}}" stepKey="see2FAChecked" before="clickSaveRoleButton"/>
29+
</actionGroup>
30+
</actionGroups>

‎TwoFactorAuth/Test/Mftf/Test/AdminReviewOrderWithReportsPermissionTest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,7 @@
88
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
99
<test name="AdminReviewOrderWithReportsPermissionTest">
1010
<before>
11-
<actionGroup ref="AdminChooseUserRoleResourceActionGroup" before="saveRole" stepKey="enableTfa">
12-
<argument name="resourceId" value="Magento_TwoFactorAuth::tfa"/>
13-
<argument name="resourceName" value="Two Factor Auth"/>
14-
</actionGroup>
11+
<comment userInput="BIC workaround" before="saveRole" stepKey="enableTfa"/>
1512
</before>
1613
</test>
1714
</tests>

‎TwoFactorAuth/Test/Mftf/Test/AdminUpdateUserRoleTest.xml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@
1515
<severity value="AVERAGE"/>
1616
</annotations>
1717
<before>
18-
<actionGroup ref="AdminChooseUserRoleResourceActionGroup" before="saveNewRole" stepKey="enableTfa">
19-
<argument name="resourceId" value="Magento_TwoFactorAuth::tfa"/>
20-
<argument name="resourceName" value="Two Factor Auth"/>
21-
</actionGroup>
18+
<comment userInput="BIC workaround" before="saveNewRole" stepKey="enableTfa"/>
2219
</before>
2320
</test>
2421
</tests>

0 commit comments

Comments
 (0)