Consider _test.{js|ts|gjs|gts} as test file. (#2157)

ember-cli · Jul 30, 2024 · 12a8077 · 12a8077
1 parent 55cd064
commit 12a8077
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/utils/ember.js b/lib/utils/ember.js
@@ -176,9 +176,12 @@ function isModuleByFilePath(filePath, module) {
 }
 
 const validFileExtensions = ['js', 'ts', 'gjs', 'gts'];
+const validTestFilePatterns = ['-test', '_test'];
 
 function isTestFile(fileName) {
-  return validFileExtensions.some((ext) => fileName.endsWith(`-test.${ext}`));
+  return validFileExtensions.some((ext) =>
+    validTestFilePatterns.some((testFilePattern) => fileName.endsWith(`${testFilePattern}.${ext}`))
+  );
 }
 
 function isMirageDirectory(fileName) {

diff --git a/tests/lib/utils/ember-test.js b/tests/lib/utils/ember-test.js
@@ -136,13 +136,20 @@ describe('isMirageConfig', () => {
 });
 
 describe('isTestFile', () => {
-  it('detects test files', () => {
+  it('detects test files ending with -test', () => {
     expect(emberUtils.isTestFile('some-test.js')).toBeTruthy();
     expect(emberUtils.isTestFile('some-test.ts')).toBeTruthy();
     expect(emberUtils.isTestFile('some-test.gjs')).toBeTruthy();
     expect(emberUtils.isTestFile('some-test.gts')).toBeTruthy();
   });
 
+  it('detects test files ending with _test', () => {
+    expect(emberUtils.isTestFile('some_test.js')).toBeTruthy();
+    expect(emberUtils.isTestFile('some_test.ts')).toBeTruthy();
+    expect(emberUtils.isTestFile('some_test.gjs')).toBeTruthy();
+    expect(emberUtils.isTestFile('some_test.gts')).toBeTruthy();
+  });
+
   it('does not detect other files', () => {
     expect(emberUtils.isTestFile('some-component.js')).toBeFalsy();
     expect(emberUtils.isTestFile('my-testing-component.js')).toBeFalsy();