From 2bf834252105a7cc7526dbc35a21fee363f64c46 Mon Sep 17 00:00:00 2001
From: nagpalkaran95 <nagpalkaran95@gmail.com>
Date: Thu, 5 Nov 2020 18:34:58 +0530
Subject: [PATCH] Update logic for isCypressProjDirValid to handle windows path

---
 bin/helpers/utils.js           |  4 ++--
 test/unit/bin/helpers/utils.js | 31 ++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/bin/helpers/utils.js b/bin/helpers/utils.js
index 66df447c..421ac529 100644
--- a/bin/helpers/utils.js
+++ b/bin/helpers/utils.js
@@ -280,8 +280,8 @@ exports.isCypressProjDirValid = (cypressProjDir, integrationFoldDir) => {
     integrationFolderDir = path.resolve(path.join(cypressProjDir, integrationFoldDir));
   }
   if (integrationFolderDir === cypressDir) return true;
-  let parentTokens = cypressDir.split("/").filter((i) => i.length);
-  let childTokens = integrationFolderDir.split("/").filter((i) => i.length);
+  let parentTokens = cypressDir.split(path.sep).filter((i) => i.length);
+  let childTokens = integrationFolderDir.split(path.sep).filter((i) => i.length);
   return parentTokens.every((t, i) => childTokens[i] === t);
 };
 
diff --git a/test/unit/bin/helpers/utils.js b/test/unit/bin/helpers/utils.js
index 1222ffde..209b714b 100644
--- a/test/unit/bin/helpers/utils.js
+++ b/test/unit/bin/helpers/utils.js
@@ -541,23 +541,28 @@ describe('utils', () => {
   });
 
   describe('isCypressProjDirValid', () => {
-    it('should return true when cypressDir and cypressProjDir is same', () => {
-      expect(utils.isCypressProjDirValid('/absolute/path', '/absolute/path')).to
-        .be.true;
+    it('should return true when cypressProjDir and integrationFoldDir is same', () => {
+      expect(utils.isCypressProjDirValid('/absolute/path', '/absolute/path')).to.be.true;
+
+      // should be as below for windows but path.resolve thinks windows path as a filename when run on linux/mac
+      // expect(utils.isCypressProjDirValid('C:\\absolute\\path', 'C:\\absolute\\path')).to.be.true;
+      expect(utils.isCypressProjDirValid('/C/absolute/path', '/C/absolute/path')).to.be.true;
     });
 
-    it('should return true when cypressProjDir is child directory of cypressDir', () => {
-      expect(
-        utils.isCypressProjDirValid(
-          '/absolute/path',
-          '/absolute/path/childpath'
-        )
-      ).to.be.true;
+    it('should return true when integrationFoldDir is child directory of cypressProjDir', () => {
+      expect(utils.isCypressProjDirValid('/absolute/path', '/absolute/path/childpath')).to.be.true;
+
+      // should be as below for windows but path.resolve thinks windows path as a filename when run on linux/mac
+      // expect(utils.isCypressProjDirValid('C:\\absolute\\path', 'C:\\absolute\\path\\childpath')).to.be.true;
+      expect(utils.isCypressProjDirValid('/C/absolute/path', '/C/absolute/path/childpath')).to.be.true;
     });
 
-    it('should return false when cypressProjDir is not child directory of cypressDir', () => {
-      expect(utils.isCypressProjDirValid('/absolute/path', '/absolute')).to.be
-        .false;
+    it('should return false when integrationFoldDir is not child directory of cypressProjDir', () => {
+      expect(utils.isCypressProjDirValid('/absolute/path', '/absolute')).to.be.false;
+
+      // should be as below for windows but path.resolve thinks windows path as a filename when run on linux/mac
+      // expect(utils.isCypressProjDirValid('C:\\absolute\\path', 'C:\\absolute')).to.be.false;
+      expect(utils.isCypressProjDirValid('/C/absolute/path', '/C/absolute')).to.be.false;
     });
   });