test: always create a new directory when copying assets

Author: hansl

tests/e2e/setup/500-create-project.ts

@@ -1,6 +1,6 @@
 import {join} from 'path';
 import {git, ng, silentNpm} from '../utils/process';
-import {expectFileToExist} from '../utils/fs';
+import { expectFileToExist, writeFile } from '../utils/fs';
 import {
   useSha,
   useNgVersion,

tests/e2e/utils/assets.ts

@@ -20,7 +20,8 @@ export function copyProjectAsset(assetName: string, to?: string) {
 }
 
 export function copyAssets(assetName: string) {
-  const tempRoot = join(getGlobalVariable('tmp-root'), 'assets', assetName);
+  const seed = +Date.now();
+  const tempRoot = join(getGlobalVariable('tmp-root'), 'assets', assetName + '-' + seed);
   const root = assetDir(assetName);
 
   return Promise.resolve()
@@ -39,8 +40,6 @@ export function copyAssets(assetName: string) {
 
 
 export function createProjectFromAsset(assetName: string) {
-  const packages = require('../../../lib/packages').packages;
-
   return Promise.resolve()
     .then(() => copyAssets(assetName))
     .then(dir => process.chdir(dir))

tests/e2e/utils/git.ts

@@ -18,17 +18,17 @@ export function gitClean() {
 }
 
 export function expectGitToBeClean() {
-  return git('status', '--porcelain')
+  return silentGit('status', '--porcelain')
     .then(({ stdout }) => {
       if (stdout != '') {
-        throw new Error('Git repo is not clean...');
+        throw new Error('Git repo is not clean...\n' + stdout);
       }
     });
 }
 
 export function gitCommit(message: string) {
   return git('add', '-A')
-    .then(() => git('status', '--porcelain'))
+    .then(() => silentGit('status', '--porcelain'))
     .then(({ stdout }) => {
       if (stdout != '') {
         return git('commit', '-am', message);

tests/e2e/utils/process.ts

@@ -22,7 +22,7 @@ export type ProcessOutput = {
 };
 
 
-function _exec(options: ExecOptions, cmd: string, args: string[]): Promise<ProcessOutput> {
+function  _exec(options: ExecOptions, cmd: string, args: string[]): Promise<ProcessOutput> {
   let stdout = '';
   let stderr = '';
   const cwd = process.cwd();