WIP: fixed?

Author: jbedard

package.json

@@ -185,8 +185,6 @@
     "postcss-loader": "7.0.0",
     "postcss-preset-env": "7.6.0",
     "prettier": "^2.0.0",
-    "protractor": "~7.0.0",
-    "puppeteer": "14.1.1",
     "quicktype-core": "6.0.69",
     "regenerator-runtime": "0.13.9",
     "resolve-url-loader": "5.0.0",

tests/legacy-cli/e2e/utils/process.ts

@@ -369,7 +369,7 @@ export async function launchTestProcess(entry: string, ...args: any[]) {
   }
 
   // Add the project node modules bin to the front of the path
-  paths.push(join(process.cwd(), 'node_modules', '.bin'));
+  paths.unshift(join(process.cwd(), 'node_modules', '.bin'));
 
   env.PATH = paths.join(delimiter);
 

tests/legacy-cli/e2e/utils/project.ts

@@ -5,7 +5,7 @@ import { packages } from '../../../../lib/packages';
 import { getGlobalVariable } from './env';
 import { prependToFile, readFile, replaceInFile, writeFile } from './fs';
 import { gitCommit } from './git';
-import { installWorkspacePackages } from './packages';
+import { installPackage, installWorkspacePackages } from './packages';
 import { exec, execAndWaitForOutputToMatch, git, ng } from './process';
 
 export function updateJsonFile(filePath: string, fn: (json: any) => any | void) {
@@ -39,26 +39,28 @@ export async function prepareProjectForE2e(name) {
 
   console.log(`Project ${name} created... Installing packages.`);
   await installWorkspacePackages();
+  await installPackage('puppeteer');
 
   await ng('generate', 'e2e', '--related-app-name', name);
 
-  // Initialize protractor webdriver. Often fails the first time so attempt twice if necessary.
-  // const webdriverCommand = exec.bind(
-  //   null,
-  //   'webdriver-manager',
-  //   'update',
-  //   '--standalone',
-  //   'false',
-  //   '--gecko',
-  //   'false',
-  //   '--versions.chrome',
-  //   '101.0.4951.41',
-  // );
-  // try {
-  //   await webdriverCommand();
-  // } catch (e) {
-  //   await webdriverCommand();
-  // }
+  // Initialize welenium webdrivers.
+  // Often fails the first time so attempt twice if necessary.
+  const webdriverCommand = exec.bind(
+    null,
+    'node_modules/protractor/bin/webdriver-manager',
+    'update',
+    '--standalone',
+    'false',
+    '--gecko',
+    'false',
+    '--versions.chrome',
+    '101.0.4951.41',
+  );
+  try {
+    await webdriverCommand();
+  } catch (e) {
+    await webdriverCommand();
+  }
 
   await useCIChrome('e2e');
   await useCIChrome('');
@@ -209,7 +211,6 @@ export async function useCIChrome(projectDir: string = ''): Promise<void> {
   const protractorConf = path.join(projectDir, 'protractor.conf.js');
   const karmaConf = path.join(projectDir, 'karma.conf.js');
 
-  const chromePath = require('puppeteer').executablePath();
   const protractorPath = require.resolve('protractor');
   const webdriverUpdatePath = require.resolve('webdriver-manager/selenium/update-config.json', {
     paths: [protractorPath],
@@ -227,7 +228,7 @@ export async function useCIChrome(projectDir: string = ''): Promise<void> {
       `browserName: 'chrome',
       chromeOptions: {
         args: ['--headless'],
-        binary: String.raw\`${chromePath}\`,
+        binary: require('puppeteer').executablePath(),
       }`,
     );
     await replaceInFile(
@@ -239,7 +240,10 @@ export async function useCIChrome(projectDir: string = ''): Promise<void> {
 
   // Use Puppeteer in karma if a config is found on the project.
   if (fs.existsSync(karmaConf)) {
-    await prependToFile(karmaConf, `process.env.CHROME_BIN = String.raw\`${chromePath}\`;`);
+    await prependToFile(
+      karmaConf,
+      `process.env.CHROME_BIN = require('puppeteer').executablePath();`,
+    );
     await replaceInFile(karmaConf, `browsers: ['Chrome']`, `browsers: ['ChromeHeadless']`);
   }
 }