Use "replaceAll()"

testspace-com · Jul 15, 2024 · 447adc8 · 447adc8
1 parent 543fd95
commit 447adc8
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 78 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cypress-xml-reporter",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "A JUnit XML reporter for Cypress that includes screenshots, videos, and logs.",
   "main": "src/reporter.js",
   "scripts": {

diff --git a/src/reporter.js b/src/reporter.js
@@ -140,7 +140,9 @@ function createTestRecord(test, specRelativePath) {
 }
 
 function normalizePath(pathString) {
-  return pathString.split(path.sep).join('/');
+  if (path.sep !== '/') {
+    return pathString.replaceAll(path.sep, '/');
+  }
 }
 
 function CypressXML(runner, options) {

diff --git a/tests/test.desc-desc.js b/tests/test.desc-desc.js
@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
 
 /**
  * Setting
@@ -41,7 +40,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -52,11 +51,11 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;
@@ -74,7 +73,7 @@ describe(testName, () => {
       });
       it('"case3" Failure', () => {
         var systemout = testcases[2]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile1)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile1.replaceAll(path.sep, '/')+']]');
       })
     });
   });
@@ -86,11 +85,11 @@ describe(testName, () => {
       expect(suites[2].$.tests).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[2].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[2].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[2]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;
@@ -108,7 +107,7 @@ describe(testName, () => {
       });
       it('"case3" Failure', () => {
         var systemout = testcases[2]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile2)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile2.replaceAll(path.sep, '/')+']]');
       })
     });
   });

diff --git a/tests/test.desc-fixture-hook-failure.js b/tests/test.desc-fixture-hook-failure.js
@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
 
 /**
  * Setting
@@ -55,7 +54,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
 });
diff --git a/tests/test.desc-nest-desc.js b/tests/test.desc-nest-desc.js
@@ -2,8 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
-
 
 /**
  * Setting
@@ -57,7 +55,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -68,11 +66,11 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('6');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;
@@ -99,7 +97,7 @@ describe(testName, () => {
       });
       it('"NEST -- case3" Failure', () => {
         var systemout = testcases[5]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile.replaceAll(path.sep, '/')+']]');
       })
     });
   });

diff --git a/tests/test.desc-nest-nest-desc.js b/tests/test.desc-nest-nest-desc.js
@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
 
 /**
  * Setting
@@ -58,7 +57,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -69,11 +68,11 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('9');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;
@@ -91,7 +90,7 @@ describe(testName, () => {
       });
       it('"case3" Failure', () => {
         var systemout = testcases[2]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile1)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile1.replaceAll(path.sep, '/')+']]');
       });
       it('"NEST1 -- case1" name', () => {
         expect(testcases[3].$.name).to.equal('NEST1 -- case1');
@@ -104,7 +103,7 @@ describe(testName, () => {
       });
       it('"NEST1 -- case3" Failure', () => {
         var systemout = testcases[5]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile2)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile2.replaceAll(path.sep, '/')+']]');
       });
       it('"NEST1 -- NEST2 -- case1" name', () => {
         expect(testcases[6].$.name).to.equal('NEST1 -- NEST2 -- case1');
@@ -117,7 +116,7 @@ describe(testName, () => {
       });
       it('"NEST1 -- NEST2 -- case3" Failure', () => {
         var systemout = testcases[8]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile3)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile3.replaceAll(path.sep, '/')+']]');
       });
 
     });

diff --git a/tests/test.desc-nofailures.js b/tests/test.desc-nofailures.js
@@ -2,8 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
-
 
 /**
  * Setting
@@ -55,7 +53,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -66,7 +64,7 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];

diff --git a/tests/test.desc-nofailures.log.js b/tests/test.desc-nofailures.log.js
@@ -2,8 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
-
 
 /**
  * Setting
@@ -57,7 +55,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -68,7 +66,7 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];

diff --git a/tests/test.desc-pending.js b/tests/test.desc-pending.js
@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
 
 /**
  * Setting
@@ -56,7 +55,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -73,11 +72,11 @@ describe(testName, () => {
       expect(suites[1].$.skipped).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;

diff --git a/tests/test.desc-testname-chars.js b/tests/test.desc-testname-chars.js
@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
 
 /**
  * Setting
@@ -56,7 +55,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('"TEST SUITE" with Quotes and Slash', () => {
@@ -67,11 +66,11 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;
@@ -89,7 +88,7 @@ describe(testName, () => {
       });
       it('"case3" name with quotes and slash with failure', () => {
         var systemout = testcases[2]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile.replaceAll(path.sep, '/')+']]');
       })
     });
   });

diff --git a/tests/test.desc.js b/tests/test.desc.js
@@ -2,7 +2,6 @@ const expect = require("chai").expect;
 const parseString = require('xml2js').parseString;
 const path = require('path');
 const fs = require('fs');
-const helpers = require('./test_helper');
 
 /**
  * Setting
@@ -56,7 +55,7 @@ describe(testName, () => {
       expect(suites[0].$.tests).to.equal('0');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
   });
   describe('TEST1', () => {
@@ -67,11 +66,11 @@ describe(testName, () => {
       expect(suites[1].$.tests).to.equal('3');
     });
     it('File Name', () => {
-      expect(suites[1].$.file).to.equal(helpers.normalizePath(testFile));
+      expect(suites[1].$.file).to.equal(testFile.replaceAll(path.sep, '/'));
     });
     it('System-out', () => {
       var systemout = suites[1]['system-out'][0];
-      expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(videoFile)+']]');
+      expect(systemout).to.equal('[[ATTACHMENT|'+videoFile.replaceAll(path.sep, '/')+']]');
     });
     describe('Testcases', ()=> {
       var testcases;
@@ -89,7 +88,7 @@ describe(testName, () => {
       });
       it('"case3" Failure', () => {
         var systemout = testcases[2]['system-out'][0];
-        expect(systemout).to.equal('[[ATTACHMENT|'+helpers.normalizePath(screenshotFile)+']]');
+        expect(systemout).to.equal('[[ATTACHMENT|'+screenshotFile.replaceAll(path.sep, '/')+']]');
       })
     });
   });