added changes based on review feedback

ember-cli · Sep 29, 2020 · 88e1edb · 88e1edb
1 parent 33be041
commit 88e1edb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/rules/no-test-support-import.js b/lib/rules/no-test-support-import.js
@@ -7,6 +7,14 @@
 const ERROR_MESSAGE_NO_IMPORT =
   'Do not import a file from test-support into production code, only into test files.';
 
+function hasTestSupportDirectory(importSource) {
+  return (
+    importSource.startsWith('test-support/') ||
+    importSource.endsWith('/test-support') ||
+    importSource.includes('/test-support/')
+  );
+}
+
 module.exports = {
   ERROR_MESSAGE_NO_IMPORT,
 
@@ -30,7 +38,7 @@ module.exports = {
         const importSource = node.source.value;
 
         if (
-          importSource.includes('test-support') &&
+          hasTestSupportDirectory(importSource) &&
           !(
             fileName.includes('/tests/') ||
             fileName.includes('/addon-test-support/') ||

diff --git a/tests/lib/rules/no-test-support-import.js b/tests/lib/rules/no-test-support-import.js
@@ -50,6 +50,7 @@ ruleTester.run('no-test-support-import', rule, {
       errors: [
         {
           message: ERROR_MESSAGE_NO_IMPORT,
+          type: 'ImportDeclaration',
         },
       ],
     },
@@ -62,6 +63,7 @@ ruleTester.run('no-test-support-import', rule, {
       errors: [
         {
           message: ERROR_MESSAGE_NO_IMPORT,
+          type: 'ImportDeclaration',
         },
       ],
     },
@@ -74,6 +76,7 @@ ruleTester.run('no-test-support-import', rule, {
       errors: [
         {
           message: ERROR_MESSAGE_NO_IMPORT,
+          type: 'ImportDeclaration',
         },
       ],
     },