Skip to content

Commit 3e7c6d9

Browse files
committed
ACP2E-3710: readd lost fix from issue 36207
1 parent 30e7e2d commit 3e7c6d9

File tree

3 files changed

+34
-10
lines changed

3 files changed

+34
-10
lines changed

app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginFormCheckDuplicateValidateMessageTest.xml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
6-
*/
3+
/**
4+
* Copyright 2022 Adobe
5+
* All Rights Reserved.
6+
*/
77
-->
88

99
<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -17,10 +17,7 @@
1717
<severity value="MAJOR"/>
1818
<group value="Customer"/>
1919
<group value="cloud"/>
20-
<group value="pr_exclude"/>
21-
<skip>
22-
<issueId value="AC-12714"/>
23-
</skip>
20+
<testCaseId value="AC-12714"/>
2421
</annotations>
2522

2623
<actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>

app/code/Magento/Theme/view/base/requirejs-config.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* Copyright © Magento, Inc. All rights reserved.
3-
* See COPYING.txt for license details.
2+
* Copyright 2014 Adobe
3+
* All Rights Reserved.
44
*/
55

66
var config = {
@@ -9,6 +9,7 @@ var config = {
99
'*': {
1010
'ko': 'knockoutjs/knockout',
1111
'knockout': 'knockoutjs/knockout',
12+
'jquery/validate': 'jquery/validate-extended',
1213
'mageUtils': 'mage/utils/main',
1314
'rjsResolver': 'mage/requirejs/resolver',
1415
'jquery-ui-modules/core': 'jquery/ui-modules/core',
@@ -66,6 +67,7 @@ var config = {
6667
},
6768
paths: {
6869
'jquery/validate': 'jquery/jquery.validate',
70+
'jquery/validate-extended': 'jquery/jquery.validate.extended',
6971
'jquery/uppy-core': 'jquery/uppy/dist/uppy.min',
7072
'prototype': 'legacy-build.min',
7173
'jquery/jquery-storageapi': 'js-storage/storage-wrapper',
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* Copyright 2025 Adobe
3+
* All Rights Reserved.
4+
*/
5+
define(['jquery', 'jquery/jquery.validate'], function ($) {
6+
$.validator.prototype.errorsFor = function (element) {
7+
let name = this.escapeCssMeta(this.idOrName(element)),
8+
describer = $(element).attr('aria-describedby'),
9+
selector = 'label[for=\'' + name + '\'], label[for=\'' + name + '\'] *';
10+
11+
// 'aria-describedby' should directly reference the error element
12+
if (describer) {
13+
selector = selector + ', #' + this.escapeCssMeta(describer)
14+
.replace(/\s+/g, ', #');
15+
selector += ':visible';
16+
}
17+
18+
return this
19+
.errors()
20+
.filter(selector);
21+
};
22+
23+
return $;
24+
});
25+

0 commit comments

Comments
 (0)