Merge pull request #821 from bmish/improve-module-filepath-detection

Avoid some false positives when detecting if a file is an Ember component, controller, etc

lib/utils/ember.js

@@ -153,13 +153,18 @@ function isDSModel(node, filePath) {
 }
 
 function isModuleByFilePath(filePath, module) {
-  const fileNameJs = `${module}.js`;
-  const fileNameTs = `${module}.ts`;
-  const folderName = `${module}s`;
+  const expectedFileNameJs = `${module}.js`;
+  const expectedFileNameTs = `${module}.ts`;
+  const expectedFolderName = `${module}s`;
+
+  const actualFolders = path.dirname(filePath).split(path.sep);
+  const actualFileName = path.basename(filePath);
 
   /* Check both folder and filename to support both classic and POD's structure */
   return (
-    filePath.includes(fileNameJs) || filePath.includes(fileNameTs) || filePath.includes(folderName)
+    actualFileName === expectedFileNameJs ||
+    actualFileName === expectedFileNameTs ||
+    actualFolders.includes(expectedFolderName)
   );
 }
 

tests/lib/utils/ember-test.js

@@ -86,6 +86,27 @@ describe('isModuleByFilePath', () => {
     const filePath = 'example-app/components/path/to/some-component.ts';
     expect(emberUtils.isModuleByFilePath(filePath, 'component')).toBeTruthy();
   });
+
+  // Avoid false positives:
+  it('should not detect a component in a folder named `fake-components`', () => {
+    const filePath = 'example-app/fake-components/path/to/file.js';
+    expect(emberUtils.isModuleByFilePath(filePath, 'component')).toBeFalsy();
+  });
+
+  it('should not detect a component with a file named `components`', () => {
+    const filePath = 'example-app/some-folder/path/to/components';
+    expect(emberUtils.isModuleByFilePath(filePath, 'component')).toBeFalsy();
+  });
+
+  it('should not detect a component with a directory named `component.js`', () => {
+    const filePath = 'example-app/component.js/path/to/file.js';
+    expect(emberUtils.isModuleByFilePath(filePath, 'component')).toBeFalsy();
+  });
+
+  it('should not detect a component with a directory named `component.ts`', () => {
+    const filePath = 'example-app/component.ts/path/to/file.js';
+    expect(emberUtils.isModuleByFilePath(filePath, 'component')).toBeFalsy();
+  });
 });
 
 describe('isMirageDirectory', () => {