fixup! fixup! feat(core): compile only schematics realted source when…

… using workspace-schematics
ccosmincc · Sep 1, 2020 · 488c373 · 488c373
1 parent 2068d8d
commit 488c373
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/e2e/utils/index.ts b/e2e/utils/index.ts
@@ -134,7 +134,7 @@ export function runNgNew(): string {
  * Sets up a new project in the temporary project path
  * for the currently selected CLI.
  */
-export function newProject(): void {
+export function newProject() {
   projName = uniq('proj');
   try {
     if (!directoryExists(tmpBackupProjPath())) {
@@ -165,6 +165,8 @@ export function newProject(): void {
     console.log(e.message);
     throw e;
   }
+
+  return { tmpProjPath: tmpProjPath() };
 }
 
 /**
@@ -174,9 +176,9 @@ export function newProject(): void {
  *
  * If one is not found, it creates a new project.
  */
-export function ensureProject(): void {
+export function ensureProject() {
   // if (!directoryExists(tmpProjPath())) {
-  newProject();
+  return newProject();
   // }
 }
 

diff --git a/e2e/workspace/src/workspace-aux-commands.test.ts b/e2e/workspace/src/workspace-aux-commands.test.ts
@@ -200,7 +200,7 @@ forEachCli((cli) => {
 
   describe('workspace-schematic', () => {
     function setup() {
-      ensureProject();
+      const { tmpProjPath } = ensureProject();
 
       const custom = uniq('custom');
       const failing = uniq('custom-failing');
@@ -216,11 +216,11 @@ forEachCli((cli) => {
         `tools/schematics/${failing}/schema.json`
       );
 
-      return { custom, failing };
+      return { custom, failing, tmpProjPath };
     }
 
     it('should compile only schematic files', () => {
-      const { custom } = setup();
+      const { custom, tmpProjPath } = setup();
       const workspace = uniq('workspace');
 
       updateFile(
@@ -231,13 +231,17 @@ forEachCli((cli) => {
       );
 
       const dryRunOutput = runCommand(
-        `npm run workspace-schematic ${custom} ${workspace} -- --no-interactive --directory=dir --skipTsConfig=true -d`
+        `npm run workspace-schematic ${custom} ${workspace} -- --no-interactive -d`
       );
 
       expect(
-        exists(`dist/out-tsc/tools/schematics/${custom}/index.js`)
+        exists(
+          `${tmpProjPath}/dist/out-tsc/tools/schematics/${custom}/index.js`
+        )
       ).toEqual(true);
-      expect(exists(`dist/out-tsc/tools/utils/utils.js`)).toEqual(false);
+      expect(
+        exists(`${tmpProjPath}/dist/out-tsc/tools/utils/utils.js`)
+      ).toEqual(false);
     });
 
     it('should support workspace-specific schematics', async () => {