Skip to content

Commit aa8550a

Browse files
jamesdanielsjamesdaniels
committed
Updating the tests
1 parent b992309 commit aa8550a

File tree

13 files changed

+496
-311
lines changed

13 files changed

+496
-311
lines changed

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"@angular/platform-server": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
6464
"@angular-devkit/build-angular": "^0.900.0-0 || ^0.900.0",
6565
"@angular-devkit/build-ng-packagr": "^0.900.0-0 || ^0.900.0",
66-
"@angular/cli": "^8.0.3",
66+
"@angular/cli": "^9.0.0-0 || ^9.0.0 || ^10.0.0-0",
6767
"@types/fs-extra": "^7.0.0",
6868
"@types/gzip-size": "^5.1.1",
6969
"@types/inquirer": "^0.0.44",
@@ -87,7 +87,7 @@
8787
"protractor": "3.0.0",
8888
"reflect-metadata": "0.1.2",
8989
"rimraf": "^2.5.4",
90-
"schematics-utilities": "^1.1.1",
90+
"schematics-utilities": "^2.0.1",
9191
"shelljs": "^0.8.0",
9292
"systemjs": "^0.19.16",
9393
"systemjs-builder": "^0.15.7",

‎src/analytics/analytics.spec.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
import { ReflectiveInjector, Provider } from '@angular/core';
21
import { TestBed, inject } from '@angular/core/testing';
3-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
2+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
43
import { AngularFireAnalytics, AngularFireAnalyticsModule, COLLECTION_ENABLED, APP_VERSION, APP_NAME } from '@angular/fire/analytics';
5-
import { COMMON_CONFIG } from './test-config';
4+
import { COMMON_CONFIG } from '../test-config';
65

76

87
describe('AngularFireAnalytics', () => {
@@ -50,8 +49,8 @@ describe('AngularFireAnalytics with different app', () => {
5049
AngularFireAnalyticsModule
5150
],
5251
providers: [
53-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
54-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
52+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
53+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG },
5554
{ provide: COLLECTION_ENABLED, useValue: true },
5655
{ provide: APP_VERSION, useValue: '0.0' },
5756
{ provide: APP_NAME, useValue: 'Test App!' }

‎src/auth/auth.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { User } from 'firebase/app';
22
import { Observable, Subject } from 'rxjs'
33
import { TestBed, inject } from '@angular/core/testing';
4-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
4+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
55
import { AngularFireAuth, AngularFireAuthModule } from '@angular/fire/auth';
66
import { COMMON_CONFIG } from '../test-config';
77
import { take, skip } from 'rxjs/operators';
@@ -137,8 +137,8 @@ describe('AngularFireAuth with different app', () => {
137137
AngularFireAuthModule
138138
],
139139
providers: [
140-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
141-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG }
140+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
141+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG }
142142
]
143143
});
144144
inject([FirebaseApp, AngularFireAuth], (app_: FirebaseApp, _afAuth: AngularFireAuth) => {

‎src/database/database.spec.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
import { FirebaseApp, AngularFireModule, FirebaseOptionsToken, FirebaseNameOrConfigToken } from '@angular/fire';
2-
import { AngularFireDatabase, AngularFireDatabaseModule, RealtimeDatabaseURL } from '@angular/fire/database';
1+
import { FirebaseApp, AngularFireModule, FIREBASE_OPTIONS, FIREBASE_APP_NAME } from '@angular/fire';
2+
import { AngularFireDatabase, AngularFireDatabaseModule, URL } from '@angular/fire/database';
33
import { TestBed, inject } from '@angular/core/testing';
44
import { COMMON_CONFIG } from '../test-config';
55
import { NgZone } from '@angular/core';
66

77
// generate random string to test fidelity of naming
8-
const FIREBASE_APP_NAME = (Math.random() + 1).toString(36).substring(7);
8+
const APP_NAME = (Math.random() + 1).toString(36).substring(7);
99

1010
describe('AngularFireDatabase', () => {
1111
let app: FirebaseApp;
@@ -15,7 +15,7 @@ describe('AngularFireDatabase', () => {
1515
beforeEach(() => {
1616
TestBed.configureTestingModule({
1717
imports: [
18-
AngularFireModule.initializeApp(COMMON_CONFIG, FIREBASE_APP_NAME),
18+
AngularFireModule.initializeApp(COMMON_CONFIG, APP_NAME),
1919
AngularFireDatabaseModule
2020
]
2121
});
@@ -47,7 +47,7 @@ describe('AngularFireDatabase', () => {
4747
});
4848

4949
it('should have an initialized Firebase app instance member', () => {
50-
expect(db.database.app.name).toEqual(FIREBASE_APP_NAME);
50+
expect(db.database.app.name).toEqual(APP_NAME);
5151
});
5252

5353
});
@@ -65,13 +65,13 @@ describe('AngularFireDatabase w/options', () => {
6565
beforeEach(() => {
6666
TestBed.configureTestingModule({
6767
imports: [
68-
AngularFireModule.initializeApp(COMMON_CONFIG, FIREBASE_APP_NAME),
68+
AngularFireModule.initializeApp(COMMON_CONFIG, APP_NAME),
6969
AngularFireDatabaseModule
7070
],
7171
providers: [
72-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
73-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
74-
{ provide: RealtimeDatabaseURL, useValue: FIREBASE_DB_NAME }
72+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
73+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG },
74+
{ provide: URL, useValue: FIREBASE_DB_NAME }
7575
]
7676
});
7777
inject([FirebaseApp, AngularFireDatabase], (app_: FirebaseApp, _db: AngularFireDatabase) => {

‎src/firestore/firestore.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
1+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
22
import { AngularFirestore } from './firestore';
33
import { AngularFirestoreModule } from './firestore.module';
44
import { AngularFirestoreDocument } from './document/document';
@@ -105,8 +105,8 @@ describe('AngularFirestore with different app', () => {
105105
AngularFirestoreModule
106106
],
107107
providers: [
108-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
109-
{ provide: FirebaseOptionsToken, useValue: FIRESTORE_CONFIG }
108+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
109+
{ provide: FIREBASE_OPTIONS, useValue: FIRESTORE_CONFIG }
110110
]
111111
});
112112
inject([FirebaseApp, AngularFirestore], (app_: FirebaseApp, _afs: AngularFirestore) => {

‎src/functions/functions.spec.ts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { ReflectiveInjector, Provider } from '@angular/core';
21
import { TestBed, inject } from '@angular/core/testing';
3-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
4-
import { AngularFireFunctions, AngularFireFunctionsModule, FUNCTIONS_REGION, FUNCTIONS_ORIGIN } from '@angular/fire/functions';
2+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
3+
import { AngularFireFunctions, AngularFireFunctionsModule, REGION, ORIGIN } from '@angular/fire/functions';
54
import { COMMON_CONFIG } from '../test-config';
65

76
describe('AngularFireFunctions', () => {
@@ -49,10 +48,10 @@ describe('AngularFireFunctions with different app', () => {
4948
AngularFireFunctionsModule
5049
],
5150
providers: [
52-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
53-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
54-
{ provide: FUNCTIONS_ORIGIN, useValue: 'http://0.0.0.0:9999' },
55-
{ provide: FUNCTIONS_REGION, useValue: 'asia-northeast1' }
51+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
52+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG },
53+
{ provide: ORIGIN, useValue: 'http://0.0.0.0:9999' },
54+
{ provide: REGION, useValue: 'asia-northeast1' }
5655
]
5756
});
5857
inject([FirebaseApp, AngularFireFunctions], (app_: FirebaseApp, _fns: AngularFireFunctions) => {

‎src/messaging/messaging.spec.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ReflectiveInjector, Provider } from '@angular/core';
22
import { TestBed, inject } from '@angular/core/testing';
3-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
3+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
44
import { AngularFireMessaging, AngularFireMessagingModule } from '@angular/fire/messaging';
5-
import { COMMON_CONFIG } from './test-config';
5+
import { COMMON_CONFIG } from '../test-config';
66

77
describe('AngularFireMessaging', () => {
88
let app: FirebaseApp;
@@ -49,8 +49,8 @@ describe('AngularFireMessaging with different app', () => {
4949
AngularFireMessagingModule
5050
],
5151
providers: [
52-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
53-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG }
52+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
53+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG }
5454
]
5555
});
5656
inject([FirebaseApp, AngularFireMessaging], (app_: FirebaseApp, _afm: AngularFireMessaging) => {

‎src/remote-config/remote-config.spec.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { ReflectiveInjector, Provider } from '@angular/core';
22
import { TestBed, inject } from '@angular/core/testing';
3-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
4-
import { AngularFireRemoteConfig, AngularFireRemoteConfigModule, REMOTE_CONFIG_SETTINGS, DEFAULT_CONFIG } from '@angular/fire/remote-config';
5-
import { COMMON_CONFIG } from './test-config';
3+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
4+
import { AngularFireRemoteConfig, AngularFireRemoteConfigModule, SETTINGS, DEFAULTS } from '@angular/fire/remote-config';
5+
import { COMMON_CONFIG } from '../test-config';
66

77
describe('AngularFireRemoteConfig', () => {
88
let app: FirebaseApp;
@@ -49,10 +49,10 @@ describe('AngularFireRemoteConfig with different app', () => {
4949
AngularFireRemoteConfigModule
5050
],
5151
providers: [
52-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
53-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
54-
{ provide: REMOTE_CONFIG_SETTINGS, useValue: {} },
55-
{ provide: DEFAULT_CONFIG, useValue: {} }
52+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
53+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG },
54+
{ provide: SETTINGS, useValue: {} },
55+
{ provide: DEFAULTS, useValue: {} }
5656
]
5757
});
5858
inject([FirebaseApp, AngularFireRemoteConfig], (app_: FirebaseApp, _rc: AngularFireRemoteConfig) => {

‎src/schematics/ng-add.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { from } from 'rxjs';
66
import { map, switchMap } from 'rxjs/operators';
77
import { Project } from './interfaces';
88
import { listProjects, projectPrompt } from './utils';
9-
import requiredDependencies from './versions.json';
9+
import requiredDependencies from './versions';
1010

1111
const stringifyFormatted = (obj: any) => JSON.stringify(obj, null, 2);
1212

‎src/schematics/versions.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

‎src/schematics/versions.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
export default {
2+
"firebase": { "version": "0.0.0" },
3+
"@angular-devkit/architect": { "dev": true, "version": "0.0.0" },
4+
"firebase-tools": { "dev": true, "version": "0.0.0" },
5+
"fuzzy": { "dev": true, "version": "0.0.0"},
6+
"inquirer": { "dev": true, "version": "0.0.0"},
7+
"inquirer-autocomplete-prompt": { "dev": true, "version": "0.0.0"}
8+
}

‎src/storage/storage.spec.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { Observable, forkJoin } from 'rxjs'
22
import { map, mergeMap, tap } from 'rxjs/operators';
33
import { TestBed, inject } from '@angular/core/testing';
4-
import { FirebaseApp, FirebaseOptionsToken, AngularFireModule, FirebaseNameOrConfigToken } from '@angular/fire';
5-
import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from '@angular/fire/storage';
4+
import { FirebaseApp, FIREBASE_OPTIONS, AngularFireModule, FIREBASE_APP_NAME } from '@angular/fire';
5+
import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, BUCKET } from '@angular/fire/storage';
66
import { COMMON_CONFIG } from '../test-config';
77

88
describe('AngularFireStorage', () => {
@@ -141,9 +141,9 @@ describe('AngularFireStorage w/options', () => {
141141
AngularFireStorageModule
142142
],
143143
providers: [
144-
{ provide: FirebaseNameOrConfigToken, useValue: FIREBASE_APP_NAME_TOO },
145-
{ provide: FirebaseOptionsToken, useValue: COMMON_CONFIG },
146-
{ provide: StorageBucket, useValue: FIREBASE_STORAGE_BUCKET }
144+
{ provide: FIREBASE_APP_NAME, useValue: FIREBASE_APP_NAME_TOO },
145+
{ provide: FIREBASE_OPTIONS, useValue: COMMON_CONFIG },
146+
{ provide: BUCKET, useValue: FIREBASE_STORAGE_BUCKET }
147147
]
148148
});
149149
inject([FirebaseApp, AngularFireStorage], (app_: FirebaseApp, _storage: AngularFireStorage) => {

0 commit comments

Comments
 (0)