Getting jasmine working again, cleaning up tests

Author: jamesdaniels

package.json

@@ -40,15 +40,15 @@
   },
   "homepage": "https://github.com/angular/angularfire#readme",
   "dependencies": {
-    "@angular-devkit/architect": "0.1200.0-rc.0",
-    "@angular-devkit/core": "12.0.0-rc.0",
-    "@angular-devkit/schematics": "12.0.0-rc.0",
-    "@angular/common": "12.0.0-rc.0",
-    "@angular/compiler": "12.0.0-rc.0",
-    "@angular/core": "12.0.0-rc.0",
-    "@angular/platform-browser": "12.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "12.0.0-rc.0",
-    "@angular/router": "12.0.0-rc.0",
+    "@angular-devkit/architect": "~0.1200.0-rc.0",
+    "@angular-devkit/core": "~12.0.0-rc.0",
+    "@angular-devkit/schematics": "~12.0.0-rc.0",
+    "@angular/common": "~12.0.0-rc.0",
+    "@angular/compiler": "~12.0.0-rc.0",
+    "@angular/core": "~12.0.0-rc.0",
+    "@angular/platform-browser": "~12.0.0-rc.0",
+    "@angular/platform-browser-dynamic": "~12.0.0-rc.0",
+    "@angular/router": "~12.0.0-rc.0",
     "firebase": "^9.0.0-beta.1",
     "firebase-admin": "^8.10.0",
     "firebase-functions": "^3.6.0",
@@ -61,24 +61,24 @@
     "lodash.isequal": "^4.5.0",
     "open": "^7.0.3",
     "rxfire": "0.500.0-canary.0df3466",
-    "rxjs": "^6.5.3",
+    "rxjs": "~6.6.0",
     "semver": "^7.1.3",
-    "tslib": "^2.0.0",
+    "tslib": "^2.1.0",
     "ws": "^7.2.1",
     "xhr2": "^0.1.4",
-    "zone.js": "0.10.2"
+    "zone.js": "~0.11.4"
   },
   "optionalDependencies": {
     "bufferutil": "^4.0.1",
     "utf-8-validate": "^5.0.2"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "12.0.0-rc.0",
+    "@angular-devkit/build-angular": "~12.0.0-rc.0",
     "@angular-devkit/build-ng-packagr": ">= 0.900 < 0.1300",
-    "@angular/animations": "12.0.0-rc.0",
-    "@angular/cli": "12.0.0-rc.0",
-    "@angular/compiler-cli": "12.0.0-rc.0",
-    "@angular/platform-server": "12.0.0-rc.0",
+    "@angular/animations": "~12.0.0-rc.0",
+    "@angular/cli": "~12.0.0-rc.0",
+    "@angular/compiler-cli": "~12.0.0-rc.0",
+    "@angular/platform-server": "~12.0.0-rc.0",
     "@types/fs-extra": "^7.0.0",
     "@types/gzip-size": "^5.1.1",
     "@types/inquirer": "^0.0.44",

sample/src/app/app.component.spec.ts

@@ -1,18 +1,18 @@
-import { TestBed } from '@angular/core/testing';
+import { TestBed, waitForAsync } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
-  beforeEach(async () => {
-    await TestBed.configureTestingModule({
+  beforeEach(waitForAsync(() => {
+    TestBed.configureTestingModule({
       imports: [
         RouterTestingModule
       ],
       declarations: [
         AppComponent
       ],
     }).compileComponents();
-  });
+  }));
 
   it('should create the app', () => {
     const fixture = TestBed.createComponent(AppComponent);

src/compat/auth-guard/auth-guard.spec.ts

@@ -6,6 +6,8 @@ import { Router, RouterModule } from '@angular/router';
 import { APP_BASE_HREF } from '@angular/common';
 import { rando } from '../../utils';
 
+class TestComponent { }
+
 describe('AngularFireAuthGuard', () => {
   let app: FirebaseApp;
   let router: Router;
@@ -16,7 +18,7 @@ describe('AngularFireAuthGuard', () => {
         AngularFireModule.initializeApp(COMMON_CONFIG, rando()),
         AngularFireAuthGuardModule,
         RouterModule.forRoot([
-          { path: 'a', redirectTo: '/', canActivate: [AngularFireAuthGuard] }
+          { path: 'a', component: TestComponent, canActivate: [AngularFireAuthGuard] }
         ])
       ],
       providers: [

tools/jasmine.js

@@ -1,22 +1,8 @@
 Jasmine = require('jasmine');
 
-jasmine = new Jasmine();
-jasmine.loadConfig({
-    spec_dir: '.',
-    spec_files: [
-        'dist/out-tsc/jasmine/**/*.jasmine.js',
-        'dist/out-tsc/jasmine/**/*.spec.js'
-    ]
-});
-
 require('reflect-metadata');
 require('zone.js/dist/zone-node');
-require('zone.js/dist/async-test');
-require('zone.js/dist/sync-test');
-require('zone.js/dist/fake-async-test');
-require('zone.js/dist/proxy');
-require('zone.js/dist/zone-patch-rxjs');
-require('zone.js/dist/task-tracking');
+require('zone.js/dist/zone-testing');
 
 const { getTestBed } = require('@angular/core/testing');
 const { platformServerTesting, ServerTestingModule } = require('@angular/platform-server/testing');
@@ -29,4 +15,13 @@ getTestBed().initTestEnvironment(
     platformServerTesting()
 );
 
+jasmine = new Jasmine();
+jasmine.loadConfig({
+    spec_dir: '.',
+    spec_files: [
+        'dist/out-tsc/jasmine/**/*.jasmine.js',
+        'dist/out-tsc/jasmine/**/*.spec.js'
+    ]
+});
+
 jasmine.execute();