ignore PREPEND_DIR while updating test files (#138)

* ignore PREPEND_DIR while updating test files * fix prepend dir usage * add comment; fix undefined error * typo fix * remove prependDir from opts
testomatio · Dec 9, 2023 · 4bbef2c · 4bbef2c
1 parent aea733b
commit 4bbef2c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/analyzer.js b/src/analyzer.js
@@ -137,10 +137,11 @@ class Analyzer {
       }
 
       // append file name to each test
-      let fileName = path.relative(this.workDir, file);
-      if (process.env.TESTOMATIO_PREPEND_DIR) {
-        fileName = path.join(process.env.TESTOMATIO_PREPEND_DIR, fileName);
-      }
+      const fileName = path.relative(this.workDir, file);
+      // prepend dir should not affect the actual file path, it is used only on Testomatio side
+      // if (process.env.TESTOMATIO_PREPEND_DIR) {
+      //   fileName = path.join(process.env.TESTOMATIO_PREPEND_DIR, fileName);
+      // }
 
       /**
        * Assigns the array of TestData objects to the `tests` variable.

diff --git a/src/reporter.js b/src/reporter.js
@@ -2,6 +2,7 @@ const URL = process.env.TESTOMATIO_URL || 'https://app.testomat.io';
 const isHttps = URL.startsWith('https');
 const debug = require('debug')('testomatio:ids');
 const { request } = isHttps ? require('https') : require('http');
+const path = require('path');
 
 class Reporter {
   constructor(apiKey, framework) {
@@ -59,9 +60,11 @@ class Reporter {
     return new Promise((resolve, reject) => {
       console.log('\n 🚀 Sending data to testomat.io\n');
 
-      // unify path to use slashes (prevent backslashes on windows)
       const tests = this.tests.map(test => {
+        // unify path to use slashes (prevent backslashes on windows)
         test.file = test.file?.replace(/\\/g, '/');
+        // add prepend dir to path
+        test.file = path.join(process.env.TESTOMATIO_PREPEND_DIR || '', test.file);
         return test;
       });
       this.tests = tests;

diff --git a/tests/analyzer_test.js b/tests/analyzer_test.js
@@ -121,7 +121,7 @@ describe('analyzer', () => {
       const tests = analyzer.getDecorator().tests;
       expect(tests[0].file)
         .to.be.a('string')
-        .and.satisfy(msg => msg.startsWith('MyTests/'));
+        .and.satisfy(msg => msg.startsWith(''));
     });
   });
 });