test: remove deprecated @angular/core/testing imports

Author: jeffbcross

src/angularfire2.spec.ts

@@ -1,14 +1,6 @@
 import {
-  describe,
-  ddescribe,
-  it,
-  iit,
-  beforeEach,
-  beforeEachProviders,
-  expect,
-  inject,
-  injectAsync,
-  async
+  addProviders,
+  inject
 } from '@angular/core/testing';
 import {ReflectiveInjector, provide, Provider} from '@angular/core';
 import {
@@ -43,18 +35,16 @@ describe('angularfire', () => {
   var listOfQuestionsRef: firebase.database.Reference;
   var angularFire2: AngularFire;
 
-  beforeEachProviders(() => [FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
-
-  describe('things', () => {
-
-  })
-  beforeEach(inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
-    angularFire2 = _af;
-    app = firebaseApp;
-    rootRef = app.database().ref();
-    questionsRef = rootRef.child('questions');
-    listOfQuestionsRef = rootRef.child('list-of-questions');
-  }));
+  beforeEach(() => {
+    addProviders([FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
+    inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
+      angularFire2 = _af;
+      app = firebaseApp;
+      rootRef = app.database().ref();
+      questionsRef = rootRef.child('questions');
+      listOfQuestionsRef = rootRef.child('list-of-questions');
+    })();
+  });
 
   afterEach((done) => {
     rootRef.remove()
@@ -66,19 +56,19 @@ describe('angularfire', () => {
 
 
   it('should be injectable via FIREBASE_PROVIDERS', () => {
-    expect(angularFire2).toBeAnInstanceOf(AngularFire);
+    expect(angularFire2 instanceof AngularFire).toBe(true);
   });
 
   describe('.auth', () => {
     it('should be an instance of AuthService', inject([AngularFire], (af:AngularFire) => {
-      expect(af.auth).toBeAnInstanceOf(AngularFireAuth);
+      expect(af.auth instanceof AngularFireAuth).toBe(true);
     }));
   });
 
 
   describe('.database', () => {
     it('should be an instance of Database', inject([AngularFire], (af:AngularFire) => {
-      expect(af.database).toBeAnInstanceOf(AngularFireDatabase);
+      expect(af.database instanceof AngularFireDatabase).toBe(true);
     }));
   });
 
@@ -91,7 +81,7 @@ describe('angularfire', () => {
   describe('defaultFirebase', () => {
     it('should create a provider', () => {
       const provider = defaultFirebase(firebaseConfig);
-      expect(provider).toBeAnInstanceOf(Provider);
+      expect(provider instanceof Provider).toBe(true);
     });
   });
 });

src/auth/auth.spec.ts

@@ -3,14 +3,8 @@ import {ReflectiveInjector, provide, Provider} from '@angular/core';
 import { Observable } from 'rxjs/Observable'
 import { Observer } from 'rxjs/Observer';
 import {
-  beforeEachProviders,
-  expect,
-  ddescribe,
-  describe,
-  inject,
-  it,
-  iit,
-  beforeEach
+  addProviders,
+  inject
 } from '@angular/core/testing';
 import 'rxjs/add/operator/do';
 
@@ -103,7 +97,7 @@ describe('FirebaseAuth', () => {
   let fbAuthObserver: Observer<firebase.User>;
   let windowLocation: any;
 
-  beforeEachProviders(() => {
+  beforeEach(() => {
     windowLocation = {
       hash: '',
       search: '',
@@ -115,7 +109,7 @@ describe('FirebaseAuth', () => {
       origin:'localhost',
       href:'https://localhost/'
     };
-    return [
+    addProviders([
       FIREBASE_PROVIDERS,
       defaultFirebase(COMMON_CONFIG),
       provide(FirebaseApp, {
@@ -129,10 +123,8 @@ describe('FirebaseAuth', () => {
       provide(WindowLocation, {
         useValue: windowLocation
       })
-    ]
-  });
+    ]);
 
-  beforeEach(() => {
     authSpy = jasmine.createSpyObj('auth', authMethods);
     authSpy['createUserWithEmailAndPassword'].and.returnValue(Promise.resolve(firebaseUser));
     authSpy['signInWithPopup'].and.returnValue(Promise.resolve(googleCredential));
@@ -162,7 +154,7 @@ describe('FirebaseAuth', () => {
 
 
   it('should be an observable', () => {
-    expect(afAuth).toBeAnInstanceOf(Observable);
+    expect(afAuth instanceof Observable).toBe(true);
   });
 
 
@@ -213,7 +205,7 @@ describe('FirebaseAuth', () => {
 
   describe('firebaseAuthConfig', () => {
     it('should return a provider', () => {
-      expect(firebaseAuthConfig({ method: AuthMethods.Password })).toBeAnInstanceOf(Provider);
+      expect(firebaseAuthConfig({ method: AuthMethods.Password }) instanceof Provider).toBe(true);
     });
 
     it('should use config in login', () => {

src/auth/auth_backend.spec.ts

@@ -1,12 +1,3 @@
-import {
-  expect,
-  ddescribe,
-  describe,
-  it,
-  iit,
-  beforeEach
-} from '@angular/core/testing';
-
 import {
   authDataToAuthState,
   AuthProviders,

src/database/firebase_list_factory.spec.ts

@@ -16,13 +16,7 @@ import {
   AngularFire
 } from '../angularfire2';
 import {
-  beforeEach,
-  it,
-  iit,
-  ddescribe,
-  describe,
-  expect,
-  beforeEachProviders,
+  addProviders,
   inject
 } from '@angular/core/testing';
 import * as utils from '../utils';
@@ -69,11 +63,12 @@ describe('FirebaseListFactory', () => {
   var val3: any;
   var app: firebase.app.App;
 
-  beforeEachProviders(() => [FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
-
-  beforeEach(inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
-    app = firebaseApp;
-  }));
+  beforeEach(() => {
+    addProviders([FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
+    inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
+      app = firebaseApp;
+    })();
+  });
 
   afterEach(done => {
     app.delete().then(done, done.fail);
@@ -83,12 +78,12 @@ describe('FirebaseListFactory', () => {
 
     it('should accept a Firebase db url in the constructor', () => {
       const list = FirebaseListFactory(`${rootFirebase}/questions`);
-      expect(list).toBeAnInstanceOf(FirebaseListObservable);
+      expect(list instanceof FirebaseListObservable).toBe(true);
     });
 
     it('should accept a Firebase db ref in the constructor', () => {
       const list = FirebaseListFactory(firebase.database().refFromURL(`${rootFirebase}/questions`));
-      expect(list).toBeAnInstanceOf(FirebaseListObservable);
+      expect(list instanceof FirebaseListObservable).toBe(true);
     });
 
   });

src/database/firebase_list_observable.spec.ts

@@ -11,13 +11,8 @@ import {
   FirebaseAppConfig,
   AngularFire
 } from '../angularfire2';
-import { 
-  describe,
-  ddescribe,
-  it,
-  iit,
-  beforeEach,
-  beforeEachProviders,
+import {
+  addProviders,
   inject
 } from '@angular/core/testing';
 
@@ -34,14 +29,15 @@ describe('FirebaseObservable', () => {
   var ref:firebase.database.Reference;
   var app: firebase.app.App;
 
-  beforeEachProviders(() => [FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
-
-  beforeEach(inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
-    app = firebaseApp;
-    ref = database().ref();
-    O = new FirebaseListObservable(ref, (observer:Observer<any>) => {
-    });
-  }));
+  beforeEach(() => {
+    addProviders([FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
+    inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
+      app = firebaseApp;
+      ref = database().ref();
+      O = new FirebaseListObservable(ref, (observer:Observer<any>) => {
+      });
+    })();
+  });
 
   afterEach(done => {
     app.delete().then(done, done.fail);

src/database/firebase_object_factory.spec.ts

@@ -1,13 +1,7 @@
 import { Subscription } from 'rxjs';
 import { FirebaseObjectFactory, FirebaseObjectObservable } from './index';
 import {
-  beforeEach,
-  it,
-  iit,
-  ddescribe,
-  describe,
-  expect,
-  beforeEachProviders,
+  addProviders,
   inject
 } from '@angular/core/testing';
 import {
@@ -34,11 +28,12 @@ describe('FirebaseObjectFactory', () => {
   var nextSpy: jasmine.Spy;
   var app: firebase.app.App;
 
-  beforeEachProviders(() => [FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
-
-  beforeEach(inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
-    app = firebaseApp;
-  }));
+  beforeEach(() => {
+    addProviders([FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
+    inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
+      app = firebaseApp;
+    })();
+  });
 
   afterEach(done => {
     app.delete().then(done, done.fail);
@@ -48,12 +43,12 @@ describe('FirebaseObjectFactory', () => {
 
     it('should accept a Firebase db url in the constructor', () => {
       const object = FirebaseObjectFactory(`${rootFirebase}/questions`);
-      expect(object).toBeAnInstanceOf(FirebaseObjectObservable);
+      expect(object instanceof FirebaseObjectObservable).toBe(true);
     });
 
     it('should accept a Firebase db ref in the constructor', () => {
       const object = FirebaseObjectFactory(firebase.database().ref().child(`questions`));
-      expect(object).toBeAnInstanceOf(FirebaseObjectObservable);
+      expect(object instanceof FirebaseObjectObservable).toBe(true);
     });
 
   });

src/database/firebase_object_observable.spec.ts

@@ -1,11 +1,5 @@
 import {
-  beforeEach,
-  it,
-  iit,
-  ddescribe,
-  describe,
-  expect,
-  beforeEachProviders,
+  addProviders,
   inject
 } from '@angular/core/testing';
 import {
@@ -34,14 +28,15 @@ describe('FirebaseObjectObservable', () => {
   var ref: firebase.database.Reference;
   var app: firebase.app.App;
 
-  beforeEachProviders(() => [FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
-
-  beforeEach(inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
-    app = firebaseApp;
-    ref = database().ref()
-    O = new FirebaseObjectObservable((observer:Observer<any>) => {
-    }, ref);
-  }));
+  beforeEach(() => {
+    addProviders([FIREBASE_PROVIDERS, defaultFirebase(firebaseConfig)]);
+    inject([FirebaseApp, AngularFire], (firebaseApp: firebase.app.App, _af: AngularFire) => {
+      app = firebaseApp;
+      ref = database().ref()
+      O = new FirebaseObjectObservable((observer:Observer<any>) => {
+      }, ref);
+    })();
+  });
 
   afterEach(done => {
     ref.off();