fix(schematics): fix e2e lint config in angular cli json

nrwl · Mar 25, 2018 · fc0bec9 · fc0bec9
1 parent 476688b
commit fc0bec9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/e2e/schematics/workspace.test.ts b/e2e/schematics/workspace.test.ts
@@ -82,6 +82,10 @@ describe('Nrwl Convert to Nx Workspace', () => {
       '@nrwl/schematics'
     );
 
+    expect(updatedAngularCLIJson.lint[0].project).toEqual('apps/proj/src/tsconfig.app.json');
+    expect(updatedAngularCLIJson.lint[1].project).toEqual('./tsconfig.spec.json');
+    expect(updatedAngularCLIJson.lint[2].project).toEqual('apps/proj/e2e/tsconfig.e2e.json');
+
     // check if tsconfig.json get merged
     const updatedTsConfig = JSON.parse(readFile('tsconfig.json'));
     expect(updatedTsConfig.compilerOptions.paths).toEqual({

diff --git a/packages/schematics/src/collection/workspace/index.ts b/packages/schematics/src/collection/workspace/index.ts
@@ -144,7 +144,7 @@ function updateAngularCLIJson(options: Schema) {
         exclude: '**/node_modules/**'
       },
       {
-        project: `${options.name}/tsconfig.e2e.json`,
+        project: join('apps', options.name, 'e2e', 'tsconfig.e2e.json'),
         exclude: '**/node_modules/**'
       }
     ];