fix(@schematics/angular): Fix root path for e2e projects during update

Brocco · filipesilva · commit 302bbb379429 · 2018-06-13T22:40:16.000+01:00
diff --git a/packages/schematics/angular/migrations/update-6/index.ts b/packages/schematics/angular/migrations/update-6/index.ts
@@ -387,8 +387,9 @@ function extractProjectsConfig(
         return entry;
       }
 
+      const projectRoot = join(normalize(appRoot), '..');
       const project: JsonObject = {
-        root: join(normalize(appRoot), '..'),
+        root: projectRoot,
         sourceRoot: appRoot,
         projectType: 'application',
       };
@@ -538,8 +539,8 @@ function extractProjectsConfig(
         architect.server = serverTarget;
       }
       const e2eProject: JsonObject = {
-        root: project.root,
-        sourceRoot: join(project.root as Path, 'e2e'),
+        root: join(projectRoot, 'e2e'),
+        sourceRoot: join(projectRoot, 'e2e'),
         projectType: 'application',
       };
 
diff --git a/packages/schematics/angular/migrations/update-6/index_spec.ts b/packages/schematics/angular/migrations/update-6/index_spec.ts
@@ -659,7 +659,7 @@ describe('Migration to v6', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
         const e2eProject = getConfig(tree).projects['foo-e2e'];
-        expect(e2eProject.root).toBe('');
+        expect(e2eProject.root).toBe('e2e');
         expect(e2eProject.sourceRoot).toBe('e2e');
         const e2eOptions = e2eProject.architect.e2e;
         expect(e2eOptions.builder).toEqual('@angular-devkit/build-angular:protractor');
@@ -673,7 +673,7 @@ describe('Migration to v6', () => {
         tree.create(oldConfigPath, JSON.stringify(baseConfig, null, 2));
         tree = schematicRunner.runSchematic('migration-01', defaultOptions, tree);
         const e2eProject = getConfig(tree).projects['foo-e2e'];
-        expect(e2eProject.root).toBe('apps/app1');
+        expect(e2eProject.root).toBe('apps/app1/e2e');
         expect(e2eProject.sourceRoot).toBe('apps/app1/e2e');
         const e2eOptions = e2eProject.architect.e2e;
         expect(e2eOptions.builder).toEqual('@angular-devkit/build-angular:protractor');
