tests: additional coverage

ember-cli · Jan 11, 2021 · 43a4ef3 · 43a4ef3
1 parent 5c704ab
commit 43a4ef3
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 35 deletions.
diff --git a/lib/rules/no-global-jquery.js b/lib/rules/no-global-jquery.js
@@ -3,6 +3,8 @@
 const { ReferenceTracker } = require('eslint-utils');
 const jqueryMethods = require('../utils/jquery-methods');
 
+const ERROR_MESSAGE = 'Do not use global `$` or `jQuery`';
+
 const jqueryMap = {
   [ReferenceTracker.CALL]: true,
 };
@@ -11,7 +13,10 @@ for (const method of jqueryMethods) {
   jqueryMap[method] = { [ReferenceTracker.CALL]: true };
 }
 
-const ERROR_MESSAGE = 'Do not use global `$` or `jQuery`';
+const traceMap = {
+  $: jqueryMap,
+  jQuery: jqueryMap,
+};
 
 //------------------------------------------------------------------------------
 // Rule Definition
@@ -37,10 +42,6 @@ module.exports = {
     return {
       Program() {
         const tracker = new ReferenceTracker(context.getScope());
-        const traceMap = {
-          $: jqueryMap,
-          jQuery: jqueryMap,
-        };
 
         for (const { node } of tracker.iterateGlobalReferences(traceMap)) {
           context.report(node, ERROR_MESSAGE);

diff --git a/lib/rules/no-jquery.js b/lib/rules/no-jquery.js
@@ -4,19 +4,38 @@ const { ReferenceTracker } = require('eslint-utils');
 const { isCallExpression } = require('../utils/types');
 const jqueryMethods = require('../utils/jquery-methods');
 
+//------------------------------------------------------------------------------
+// General rule -  Disallow usage of jQuery
+//------------------------------------------------------------------------------
+
+const ERROR_MESSAGE = 'Do not use jQuery';
+
 const jqueryMap = {
   [ReferenceTracker.CALL]: true,
 };
 
 for (const method of jqueryMethods) {
-  jqueryMap[method] = { [ReferenceTracker.READ]: true };
+  jqueryMap[method] = { [ReferenceTracker.CALL]: true };
 }
 
-//------------------------------------------------------------------------------
-// General rule -  Disallow usage of jQuery
-//------------------------------------------------------------------------------
+const globalMap = {
+  $: jqueryMap,
+  jQuery: jqueryMap,
+};
 
-const ERROR_MESSAGE = 'Do not use jQuery';
+const esmMap = {
+  jquery: {
+    [ReferenceTracker.ESM]: true,
+    default: jqueryMap,
+  },
+  ember: {
+    [ReferenceTracker.ESM]: true,
+    default: {
+      $: jqueryMap,
+    },
+    $: jqueryMap,
+  },
+};
 
 module.exports = {
   meta: {
@@ -59,27 +78,9 @@ module.exports = {
         const scope = context.getScope();
         const tracker = new ReferenceTracker(scope);
 
-        const globalMap = {
-          $: jqueryMap,
-          jQuery: jqueryMap,
-        };
-
-        const esmMap = {
-          jquery: {
-            [ReferenceTracker.ESM]: true,
-            default: jqueryMap,
-          },
-          ember: {
-            [ReferenceTracker.ESM]: true,
-            default: {
-              $: jqueryMap,
-            },
-            $: jqueryMap,
-          },
-        };
-
         /**
          * Global references
+         *
          * eg; $(body) and $.post()
          */
         for (const { node } of tracker.iterateGlobalReferences(globalMap)) {
@@ -88,6 +89,11 @@ module.exports = {
 
         /**
          * ESM references
+         *   import $ from 'jquery'
+         *   import { $ as jq } from 'ember'
+         *
+         * eg;
+         *   $(body) and jq.post()
          */
         for (const { node } of tracker.iterateEsmReferences(esmMap)) {
           report(node);

diff --git a/tests/lib/rules/no-global-jquery.js b/tests/lib/rules/no-global-jquery.js
@@ -457,5 +457,21 @@ ruleTester.run('no-global-jquery', rule, {
         },
       ],
     },
+    {
+      code: `
+        export default Ember.Component({
+          init() {
+            jQuery.extend();
+          }
+        });`,
+      parserOptions,
+      globals,
+      output: null,
+      errors: [
+        {
+          message: ERROR_MESSAGE,
+        },
+      ],
+    },
   ],
 });
diff --git a/tests/lib/rules/no-jquery.js b/tests/lib/rules/no-jquery.js
@@ -76,7 +76,7 @@ eslintTester.run('no-jquery', rule, {
       errors: [
         {
           message: ERROR_MESSAGE,
-          type: 'MemberExpression',
+          type: 'CallExpression',
         },
       ],
     },
@@ -110,7 +110,7 @@ eslintTester.run('no-jquery', rule, {
       errors: [
         {
           message: ERROR_MESSAGE,
-          type: 'MemberExpression',
+          type: 'CallExpression',
         },
       ],
     },
@@ -129,12 +129,12 @@ eslintTester.run('no-jquery', rule, {
       errors: [
         {
           message: ERROR_MESSAGE,
-          type: 'MemberExpression',
+          type: 'CallExpression',
           line: 6,
         },
         {
           message: ERROR_MESSAGE,
-          type: 'MemberExpression',
+          type: 'CallExpression',
           line: 7,
         },
       ],
@@ -160,7 +160,7 @@ eslintTester.run('no-jquery', rule, {
     {
       code: `
         import E from 'ember';
-        export default Ember.Component({
+        export default E.Component({
           didInsertElement() {
             E.$(body).addClass('active')
           }
@@ -176,7 +176,7 @@ eslintTester.run('no-jquery', rule, {
     // import $ from ember
     {
       code: `
-        import { $ } from 'ember';
+        import Ember, { $ } from 'ember';
         export default Ember.Component({
           didInsertElement() {
             $(body).addClass('active')
@@ -264,6 +264,7 @@ eslintTester.run('no-jquery', rule, {
     },
     {
       code: `
+        import Ember from 'ember';
         export default Ember.Component({
           didInsertElement() {
             this.$.extend({}, a, b)