From ad9e0c7a0a44e3df1ab6aed6cb780b37ea1593b4 Mon Sep 17 00:00:00 2001 From: vsavkin Date: Tue, 3 Oct 2017 20:35:01 -0400 Subject: [PATCH] fix(schematics): covert-to-workspace to update protractor.js properly --- packages/schematics/src/convert-to-workspace/index.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/packages/schematics/src/convert-to-workspace/index.ts b/packages/schematics/src/convert-to-workspace/index.ts index fc73e96281..cdfac299df 100644 --- a/packages/schematics/src/convert-to-workspace/index.ts +++ b/packages/schematics/src/convert-to-workspace/index.ts @@ -116,12 +116,10 @@ function updateProtractorConf() { throw new Error('Cannot find protractor.conf.js'); } const protractorConf = host.read('protractor.conf.js')!.toString('utf-8'); - const angularCliJson = JSON.parse(host.read('.angular-cli.json')!.toString('utf-8')); + const updatedConf = protractorConf.replace(`./e2e/**/*.e2e-spec.ts`, `./apps/**/*.e2e-spec.ts`) + .replace(`e2e/tsconfig.e2e.json`, `./tsconfig.e2e.json`); - protractorConf.replace(`'./e2e/**/*.e2e-spec.ts'`, `'.apps/${angularCliJson.project.name}/e2e/**/*.e2e-spec.ts'`) - .replace(`'e2e/tsconfig.e2e.json'`, `'./tsconfig.e2e.json'`); - - host.overwrite('protractor.conf.js', JSON.stringify(protractorConf, null, 2)); + host.overwrite('protractor.conf.js', updatedConf); return host; };