AC-391: Static test to cover "deprecated" jQuery methods

- Fix detection of jQuery ids

Author: Rrego6

Magento2/Tests/Eslint/AndSelfTest.js

@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('div').find('p').andSelf().addClass('border');
+        $('div').find('p').andSelf().addClass('border');
+    });
 });

Magento2/Tests/Eslint/BindUnbindTest.js

@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('.btn1').bind('click');
+        $('.btn1').bind('click');
+    });
 });

Magento2/Tests/Eslint/DelegateUndelegateTest.js

@@ -1,7 +1,11 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('table').delegate('td', 'click', function () {
-        $(this).toggleClass('chosen');
+        $('table').delegate('td', 'click', function () {
+            $(this).toggleClass('chosen');
+        });
     });
 });

Magento2/Tests/Eslint/DeprecatedExprTest.js

@@ -1,6 +1,10 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function (jQuery) {
+    $(function () {
+        'use strict';
 
-    $.extend($.expr[':'], {});
-    jQuery.extend($.expr.filters, {});
+        jQuery.extend(jQuery.expr[':'], {});
+        jQuery.extend(jQuery.expr.filters, {});
+    });
 });

Magento2/Tests/Eslint/EventShorthandTest.js

@@ -1,5 +1,10 @@
-$(document).ready(function () {
-    'use strict';
-    $('#result').unload(function () {});
+define([
+    'jquery',
+], function (jQuery) {
+    jQuery(document).ready(function () {
+        'use strict';
+        jQuery('#result').unload(function () {
+        });
+    });
 });
 

Magento2/Tests/Eslint/InputEventShorthandTest.js

@@ -1,6 +1,11 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('#result').blur();
-    $.fn.focus(function () {});
+        $('#result').blur();
+        $.fn.focus(function () {
+        });
+    });
 });

Magento2/Tests/Eslint/MiscDeprecatedFunctionsTest.js

@@ -1,8 +1,12 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $.parseJSON('');
-    jQuery.type({});
-    $.isArray({});
-    $.isFunction({});
+        $.parseJSON('');
+        $.type({});
+        $.isArray({});
+        $.isFunction({});
+    });
 });

Magento2/Tests/Eslint/SizeTest.js

@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $('div').size();
+        $('div').size();
+    });
 });

Magento2/Tests/Eslint/TrimTest.js

@@ -1,5 +1,9 @@
-$(function () {
-    'use strict';
+define([
+    'jquery',
+], function ($) {
+    $(function () {
+        'use strict';
 
-    $.trim('    hello, how are you?    ');
+        $.trim('    hello, how are you?    ');
+    });
 });

eslint/rules/utils.js

@@ -1,10 +1,74 @@
 /**
- * Traverses the node to identify its type
+ * Get representation of define object
+ * @param node
+ * @returns object
+ */
+function define(node) {
+    'use strict';
+    var defineStmt, args;
+    defineStmt = node.body.find(function (stmt) {
+        return (
+            stmt.type === 'ExpressionStatement' &&
+            stmt.expression.type === 'CallExpression' &&
+            stmt.expression.callee.type === 'Identifier' &&
+            stmt.expression.callee.name === 'define' &&
+            stmt.expression.arguments.length > 0 &&
+            stmt.expression.arguments[0].type === 'ArrayExpression'
+        );
+    });
+    if (!defineStmt) {
+        return;
+    }
+
+    args = defineStmt.expression.arguments;
+
+    return {
+        func: defineStmt.expression,
+        modulePaths: args[0].elements,
+        moduleNames: args.length > 1 && args[1].params || []
+    };
+}
+
+/**
+ * Get jQueryName from define
+ * @param defineObject
+ * @returns {null|*}
+ */
+function getJqueryName(defineObject) {
+    var jQueryPathIndex;
+    if (!defineObject.modulePaths || !defineObject.moduleNames) {
+        return null;
+    }
+    jQueryPathIndex = defineObject.modulePaths.findIndex(function (paths) {
+        return paths.value.toLowerCase() === 'jquery';
+    });
+    if (jQueryPathIndex === -1 || jQueryPathIndex >= defineObject.moduleNames.length) {
+        return null;
+    }
+    return defineObject.moduleNames[jQueryPathIndex];
+
+}
+
+/**
+ * Get Root Program node
+ */
+function getProgramNode(node) {
+    'use strict';
+    if (!node.parent) {
+        return node;
+    }
+    return getProgramNode(node.parent);
+}
+
+
+
+/**
+ * Traverses the node to identify its id
  *
  * @param {Object} node - The node to check
  * @returns {Object|Null}
  */
-function traverse(node) {
+function getExpressionId(node) {
     'use strict';
 
     while (node) {
@@ -37,13 +101,19 @@ function traverse(node) {
 
 function isjQuery(node) {
     'use strict';
+    var parentNode = getProgramNode(node);
+    var defineNode = define(parentNode);
+    if (!defineNode) {
+        return false;
+    }
+    var jQueryID = getJqueryName(defineNode);
 
-    var id = traverse(node);
+    var id = getExpressionId(node);
 
-    return id && (id.name === '$' || id.name.toLowerCase() === 'jquery');
+    return id && jQueryID && id.name === jQueryID.name;
 }
 
 module.exports = {
-    traverse: traverse,
+    traverse: getExpressionId,
     isjQuery: isjQuery
 };