test: update CI chrome for single project structure

Author: filipesilva

tests/e2e/setup/500-create-project.ts

@@ -33,7 +33,8 @@ export default async function() {
   return Promise.resolve()
     .then(() => useBuiltPackages())
     .then(() => argv.devkit && useDevKit(argv.devkit))
-    .then(() => useCIChrome())
+    .then(() => useCIChrome('e2e'))
+    .then(() => useCIChrome('src'))
     .then(() => useCIDefaults())
     .then(() => argv['ng-version'] ? useNgVersion(argv['ng-version']) : Promise.resolve())
     .then(() => argv.nightly || argv['ng-sha'] ? useSha() : Promise.resolve())

tests/e2e/tests/generate/application/application-basic.ts

@@ -6,6 +6,7 @@ import { useCIChrome } from '../../../utils/project';
 export default function() {
   return ng('generate', 'application', 'app2')
     .then(() => expectFileToMatch('angular.json', /\"app2\":/))
-    .then(() => useCIChrome('app2'))
+    .then(() => useCIChrome('projects/app2'))
+    .then(() => useCIChrome('projects/app2-e2e'))
     .then(() => ng('test', 'app2', '--watch=false'));
 }

tests/e2e/tests/generate/library/library-basic.ts

@@ -5,7 +5,7 @@ import { useCIChrome } from '../../../utils/project';
 export default function () {
   return ng('generate', 'library', 'my-lib')
     .then(() => expectFileToMatch('angular.json', /\"my-lib\":/))
-    .then(() => useCIChrome('my-lib'))
+    .then(() => useCIChrome('projects/my-lib'))
     .then(() => silentNpm('install'))
     .then(() => ng('build', 'my-lib'))
     .then(() => ng('test', 'my-lib', '--watch=false'));

tests/e2e/utils/project.ts

@@ -39,7 +39,8 @@ export function createProject(name: string, ...args: string[]) {
     .then(() => ng('new', name, '--skip-install', ...args))
     .then(() => process.chdir(name))
     .then(() => useBuiltPackages())
-    .then(() => useCIChrome())
+    .then(() => useCIChrome('e2e'))
+    .then(() => useCIChrome('src'))
     .then(() => useCIDefaults())
     .then(() => argv['ng2'] ? useNg2() : Promise.resolve())
     .then(() => argv['ng4'] ? useNg4() : Promise.resolve())
@@ -169,13 +170,13 @@ export function useCIDefaults() {
   });
 }
 
-export function useCIChrome(projectDir = 'test-project') {
+export function useCIChrome(projectDir: string) {
   // There's a race condition happening in Chrome. Enabling logging in chrome used by
   // protractor actually fixes it. Logging is piped to a file so it doesn't affect our setup.
   // --no-sandbox is needed for Circle CI.
   // Travis can use headless chrome, but not appveyor.
   return Promise.resolve()
-    .then(() => replaceInFile(`projects/${projectDir}-e2e/protractor.conf.js`,
+    .then(() => replaceInFile(`${projectDir}/protractor.conf.js`,
       `'browserName': 'chrome'`,
       `'browserName': 'chrome',
         chromeOptions: {
@@ -188,7 +189,7 @@ export function useCIChrome(projectDir = 'test-project') {
     `))
     // Not a problem if the file can't be found.
     .catch(() => null)
-    .then(() => replaceInFile(`projects/${projectDir}/karma.conf.js`, `browsers: ['Chrome'],`,
+    .then(() => replaceInFile(`${projectDir}/karma.conf.js`, `browsers: ['Chrome'],`,
       `browsers: ['ChromeCI'],
       customLaunchers: {
         ChromeCI: {