resolve overlapping testnames issue (#3539)

nightwatchjs · Apr 6, 2023 · a647ee7 · a647ee7
1 parent 5557e5a
commit a647ee7
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/lib/utils/index.js b/lib/utils/index.js
@@ -261,7 +261,8 @@ class Utils {
         }
       }
     }
-
+    parentFolder = this.isFileNameValid(parentFolder) ? '' : parentFolder;
+
     return path.join(parentFolder, diffInFolder, moduleName);
   }
 

diff --git a/test/src/utils/testUtils.js b/test/src/utils/testUtils.js
@@ -206,6 +206,28 @@ describe('test Utils', function() {
     console = oldConsole;
   });
 
+  it('test getModuleKey', function() {
+    const srcFolderPath = path.join(__dirname, '../../sampletests/before-after');
+    const {statSync, readdirSync} = require('fs');
+    const getSrcTestsPaths = (testPath)=>{
+      let fullPaths = [];
+      readdirSync(testPath).forEach(file=>{
+        if (statSync(path.join(testPath, file)).isDirectory()){
+          fullPaths = [...fullPaths, ...getSrcTestsPaths(path.join(testPath, file))];
+        } else {
+          fullPaths.push(path.join(testPath, file));
+        }
+      });
+
+      return fullPaths;
+    };
+    const currentTestPath = path.join(srcFolderPath, 'sampleSingleTest.js');
+    const testFiles = getSrcTestsPaths(srcFolderPath);
+    const fullPaths = testFiles.map(file=>({env: 'default', module: file}));
+    assert.equal(Utils.getModuleKey(currentTestPath, testFiles, fullPaths), 'sampleSingleTest.js');
+    assert.equal(Utils.getModuleKey(currentTestPath, ['test/sampletests/simple', 'test/sampletests/before-after'], fullPaths), path.join('before-after', 'sampleSingleTest.js'));
+  });
+
 
   describe('test findTSConfigFile', function () {
     const {constants, rmdirSync} = require('fs');