From e4f45afad9fac48e449ea724b6b2d7b914fd532f Mon Sep 17 00:00:00 2001 From: --get Date: Fri, 9 Nov 2018 18:37:38 -0500 Subject: [PATCH] fix(schematics): set correct tsConfig for lint for cypress project --- .../collection/cypress-project/cypress-project.spec.ts | 8 ++++++-- .../schematics/src/collection/cypress-project/index.ts | 4 ++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/schematics/src/collection/cypress-project/cypress-project.spec.ts b/packages/schematics/src/collection/cypress-project/cypress-project.spec.ts index 0a774e2a21..610c9cab46 100644 --- a/packages/schematics/src/collection/cypress-project/cypress-project.spec.ts +++ b/packages/schematics/src/collection/cypress-project/cypress-project.spec.ts @@ -81,9 +81,13 @@ describe('schematic:cypres-project', () => { appTree ); const angularJson = readJsonInTree(tree, 'angular.json'); + const project = angularJson.projects['my-app-e2e']; - expect(angularJson.projects['my-app-e2e'].root).toEqual( - 'apps/my-app-e2e' + expect(project.root).toEqual('apps/my-app-e2e'); + + expect(project.architect.e2e.builder).toEqual('@nrwl/builders:cypress'); + expect(project.architect.lint.options.tsConfig).toEqual( + 'apps/my-app-e2e/tsconfig.e2e.json' ); }); diff --git a/packages/schematics/src/collection/cypress-project/index.ts b/packages/schematics/src/collection/cypress-project/index.ts index ac6887aa7c..029c719e0b 100644 --- a/packages/schematics/src/collection/cypress-project/index.ts +++ b/packages/schematics/src/collection/cypress-project/index.ts @@ -125,6 +125,10 @@ function updateAngularJson(options: CypressProjectSchema): Rule { } } }; + projectConfig.architect.lint.options.tsConfig = join( + normalize(options.e2eProjectRoot), + 'tsconfig.e2e.json' + ); json.projects[options.e2eProjectName] = projectConfig; return json; });