fix(testing): fix cypress 8.2 for windows

nrwl · Jun 27, 2019 · 3b699da · 3b699da
1 parent 7640598
commit 3b699da
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/packages/cypress/src/builders/cypress/cypress.impl.ts b/packages/cypress/src/builders/cypress/cypress.impl.ts
@@ -207,7 +207,7 @@ function isLegacy(
     tsconfigJson.compilerOptions.outDir
   );
 
-  return !relative(tsOutDirPath, integrationFolder).startsWith('../');
+  return !relative(tsOutDirPath, integrationFolder).startsWith('..');
 }
 
 function showLegacyWarning(context: BuilderContext) {

diff --git a/packages/cypress/src/migrations/update-8-2-0/update-8-2-0.ts b/packages/cypress/src/migrations/update-8-2-0/update-8-2-0.ts
@@ -28,6 +28,7 @@ import {
   ScriptTarget
 } from 'typescript';
 import { dirname, join, relative } from 'path';
+import { normalize } from '@angular-devkit/core';
 
 async function updateCypressJson(host: Tree, context: SchematicContext) {
   const rules: Rule[] = [];
@@ -57,11 +58,13 @@ async function updateCypressJson(host: Tree, context: SchematicContext) {
             }
             return (
               './' +
-              relative(
-                dirname(target.options.cypressConfig as string),
+              normalize(
                 relative(
-                  './' + tsConfig.options.outDir,
-                  join(dirname(target.options.cypressConfig as string), path)
+                  dirname(target.options.cypressConfig as string),
+                  relative(
+                    './' + tsConfig.options.outDir,
+                    join(dirname(target.options.cypressConfig as string), path)
+                  )
                 )
               )
             );