From 313de9ca4f6a3b7e987f8fac149d0e7c4d73b042 Mon Sep 17 00:00:00 2001
From: victor savkin <mail@vsavkin.com>
Date: Sat, 23 Nov 2019 15:13:05 -0500
Subject: [PATCH] build(nx): fix e2e tests

---
 e2e/node.test.ts |  2 +-
 e2e/utils.ts     | 49 +++++++-----------------------------------------
 2 files changed, 8 insertions(+), 43 deletions(-)

diff --git a/e2e/node.test.ts b/e2e/node.test.ts
index 80f01bbf2b..66b0eced39 100644
--- a/e2e/node.test.ts
+++ b/e2e/node.test.ts
@@ -35,7 +35,7 @@ forEachCli(currentCLIName => {
   const linter = currentCLIName === 'angular' ? 'tslint' : 'eslint';
 
   describe('Node Applications', () => {
-    fit('should be able to generate an express application', async done => {
+    it('should be able to generate an express application', async done => {
       ensureProject();
       const nodeapp = uniq('nodeapp');
 
diff --git a/e2e/utils.ts b/e2e/utils.ts
index f98dc284d1..0aee9d15cf 100644
--- a/e2e/utils.ts
+++ b/e2e/utils.ts
@@ -272,7 +272,11 @@ export function copyMissingPackages(): void {
     'speed-measure-webpack-plugin',
     'webpack-merge',
     'istanbul-instrumenter-loader',
-    'semver'
+    'semver',
+
+    'mime',
+    'less',
+    'send'
   ];
   modulesToCopy.forEach(m => copyNodeModule(m));
   updateFile(
@@ -298,11 +302,8 @@ export function copyMissingPackages(): void {
     )}`
   );
   execSync(`rm -rf ${tmpProjPath('node_modules/cypress/node_modules/@types')}`);
-  execSync(
-    `cp -a node_modules/mime ${tmpProjPath(
-      'node_modules/karma/node_modules/mime'
-    )}`
-  );
+  execSync(`rm -rf node_modules/karma/node_modules/mime`);
+  execSync(`rm -rf node_modules/ng-packagr/node_modules/mime`);
 }
 
 function copyNodeModule(name: string) {
@@ -369,42 +370,6 @@ export function runNgAdd(
   }
 }
 
-export function runCLIFromSubfolder(
-  command?: string,
-  subFolder?: string,
-  opts = {
-    silenceError: false
-  }
-): string {
-  const backToRoot = subFolder
-    ? subFolder
-        .split('/')
-        .map(_ => '..')
-        .join('/')
-    : '.';
-
-  try {
-    return execSync(
-      `node ${backToRoot}/node_modules/@nrwl/cli/bin/nx.js ${command}`,
-      {
-        cwd: tmpProjPath(subFolder)
-      }
-    )
-      .toString()
-      .replace(
-        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-        ''
-      );
-  } catch (e) {
-    if (opts.silenceError) {
-      return e.stdout.toString();
-    } else {
-      console.log(e.stdout.toString(), e.stderr.toString());
-      throw e;
-    }
-  }
-}
-
 export function runCLI(
   command?: string,
   opts = {