Master CI fixes

.circleci/config.yml

@@ -42,6 +42,7 @@ executors:
         default: *default_nodeversion
     docker:
       - image: cimg/node:<< parameters.nodeversion >>
+    working_directory: ~/ng
     resource_class: small
 
   test-executor:
@@ -51,12 +52,14 @@ executors:
         default: *default_nodeversion
     docker:
       - image: cimg/node:<< parameters.nodeversion >>
+    working_directory: ~/ng
     environment:
       NPM_CONFIG_PREFIX: ~/.npm-global
     resource_class: large
 
   windows-executor:
     # Same as https://circleci.com/orbs/registry/orb/circleci/windows, but named.
+    working_directory: ~/ng
     resource_class: windows.medium
     shell: powershell.exe -ExecutionPolicy Bypass
     machine:
@@ -121,7 +124,6 @@ jobs:
   setup:
     executor: action-executor
     resource_class: medium
-    working_directory: /mnt/ramdisk
     steps:
       - checkout
       - run:

integration/angular_cli/package.json

@@ -8,7 +8,7 @@
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e --prod",
-    "postinstall": "webdriver-manager update --standalone false --gecko false --versions.chrome 84.0.4147.30"
+    "postinstall": "webdriver-manager update --standalone false --gecko false --versions.chrome 85.0.4183.38"
   },
   "private": true,
   "dependencies": {
@@ -40,7 +40,7 @@
     "karma-jasmine": "~3.3.0",
     "karma-jasmine-html-reporter": "^1.5.0",
     "protractor": "~5.4.3",
-    "puppeteer": "3.0.2",
+    "puppeteer": "5.2.1",
     "ts-node": "~8.3.0",
     "tslint": "~6.1.0",
     "typescript": "~3.9.2"

package.json

@@ -37,7 +37,7 @@
     "preinstall": "node ./tools/yarn/check-yarn.js",
     "postinstall": "yarn webdriver-update && yarn ngcc",
     "//webdriver-update-README": "ChromeDriver version must match Puppeteer Chromium version, see https://github.com/GoogleChrome/puppeteer/releases http://chromedriver.chromium.org/downloads",
-    "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 84.0.4147.30",
+    "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 85.0.4183.38",
     "ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
   },
   "repository": {

packages/schematics/schematics/schematic/files/src/my-full-schematic/index_spec.ts

@@ -8,10 +8,10 @@ const collectionPath = path.join(__dirname, '../collection.json');
 
 
 describe('my-full-schematic', () => {
-  it('requires required option', () => {
+  it('requires required option', async () => {
     // We test that
     const runner = new SchematicTestRunner('schematics', collectionPath);
-    expectAsync(runner.runSchematicAsync('my-full-schematic', {}, Tree.empty()).toPromise()).toBeRejected();
+    await expectAsync(runner.runSchematicAsync('my-full-schematic', {}, Tree.empty()).toPromise()).toBeRejected();
   });
 
   it('works', async () => {

tests/legacy-cli/e2e/tests/schematics_cli/blank-test.ts

@@ -17,6 +17,7 @@ export default async function () {
     'install',
     '-g',
     '@angular-devkit/schematics-cli',
+    '--registry=http://localhost:4873',
   );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');
 

tests/legacy-cli/e2e/tests/schematics_cli/schematic-test.ts

@@ -17,6 +17,7 @@ export default async function () {
     'install',
     '-g',
     '@angular-devkit/schematics-cli',
+    '--registry=http://localhost:4873',
   );
   await exec(process.platform.startsWith('win') ? 'where' : 'which', 'schematics');