Skip to content

Commit e4c8f20

Browse files
committed
AC-391: Static test to cover "deprecated" jQuery methods
- Fixed transversal issues
1 parent 27d0c44 commit e4c8f20

File tree

5 files changed

+12
-8
lines changed

5 files changed

+12
-8
lines changed

Magento2/Tests/Eslint/EventShorthandTest.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ $(document).ready(function () {
22
'use strict';
33
$('#result').unload(function () {});
44
});
5+

eslint/rules/jquery-no-click-event-shorthand.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ module.exports = {
4242
name = node.callee.property.name;
4343
context.report({
4444
node: node,
45-
message:
46-
'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
45+
message: 'Instead of .' + name + '(fn) use .on("' + name + '", fn). Instead of .' + name +
4746
'() use .trigger("' + name + '")'
4847
});
4948
}

eslint/rules/jquery-no-event-shorthand.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,14 @@ module.exports = {
3232
'unload': 'jQuery.unload() was removed, use .on("unload", fn) instead.',
3333
'ready': 'jQuery.ready(handler) is deprecated and should be replaced with jQuery(handler)'
3434
},
35-
name;
35+
name,
36+
message;
3637

3738
if (node.callee.type !== 'MemberExpression') {return;}
3839

3940
name = node.callee.property.name;
40-
if (!(name in namesToMsg)) {return;}
41+
if (!namesToMsg.hasOwnProperty(name)) {return;}
42+
message = namesToMsg[name];
4143

4244
if (utils.isjQuery(node)) {
4345
context.report({

eslint/rules/jquery-no-misc-deprecated-functions.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,17 +38,19 @@ module.exports = {
3838
'parseJSON' : 'jQuery.parseJSON() is deprecated. ' +
3939
'To parse JSON strings, use the native JSON.parse method instead'
4040
},
41-
name;
41+
name,
42+
message;
4243

4344
if (node.callee.type !== 'MemberExpression') {return;}
4445

4546
name = node.callee.property.name;
46-
if (!(name in namesToMsg)) {return;}
47+
if (!namesToMsg.hasOwnProperty(name)) {return;}
48+
message = namesToMsg[name];
4749

4850
if (utils.isjQuery(node)) {
4951
context.report({
5052
node: node,
51-
message: namesToMsg[name]
53+
message: message
5254
});
5355
}
5456
}

eslint/rules/utils.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function isjQuery(node) {
4040

4141
var id = traverse(node);
4242

43-
return id && id.name.startsWith('$') || id.name.toLowerCase() === 'jquery';
43+
return id && (id.name.startsWith('$') || id.name.toLowerCase() === 'jquery');
4444
}
4545

4646
module.exports = {

0 commit comments

Comments
 (0)