fix: fix path seperator in symlink detection

newrelic-forks · Aug 25, 2020 · 3898ed5 · 3898ed5
1 parent 8fc0540
commit 3898ed5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/lib/file_system.js b/lib/file_system.js
@@ -87,7 +87,7 @@ class FileSystem {
     const onlySymlinks = {}
     for (const fullPath in symlinks) {
       if (symlinks[fullPath]) {
-        const relativeToRepoPath = path.relative(this.targetDir, fullPath)
+        const relativeToRepoPath = path.relative(this.targetDir, fullPath).split(path.sep).join('/')
         onlySymlinks[relativeToRepoPath] = true
       }
     }
@@ -131,7 +131,7 @@ class FileSystem {
   shouldInclude (filePath) {
     if (this.filterPaths.length === 0) { return true }
     const resolvedPath = path.relative(this.targetDir, path.resolve(this.targetDir, filePath))
-    return this.filterPaths.some(p => resolvedPath.startsWith(path.normalize(p)))
+    return this.filterPaths.some(p => resolvedPath.startsWith(p))
   }
 
   /**

diff --git a/tests/lib/file_system_tests.js b/tests/lib/file_system_tests.js
@@ -7,9 +7,11 @@ const expect = chai.expect
 const realFs = require('fs')
 
 describe('lib', () => {
-  describe('file_system', () => {
+  describe('file_system', function () {
     const FileSystem = require('../../lib/file_system')
 
+    this.timeout(10000)
+
     describe('fileExists', () => {
       it('should return pass if the file exists', async () => {
         const index = 'text_file_for_test.txt'