Skip to content

Commit 1adb351

Browse files
committed
fix import firebase in test
1 parent bdf302a commit 1adb351

File tree

9 files changed

+44
-38
lines changed

9 files changed

+44
-38
lines changed

packages/@posva/vuefire-core/__tests__/firestore/collection.spec.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { bindCollection } from '../../src'
22
import { db, createOps, spyUnbind } from '@posva/vuefire-test-helpers'
3-
import { firestore } from 'firebase'
3+
import firebase from 'firebase/app'
44
import { OperationsType } from '../../src/shared'
55

66
describe('collections', () => {
7-
let collection: firestore.CollectionReference,
7+
let collection: firebase.firestore.CollectionReference,
88
vm: Record<string, any>,
99
resolve: (data: any) => void,
1010
reject: (error: any) => void,

packages/@posva/vuefire-core/__tests__/firestore/document.spec.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import { bindDocument } from '../../src'
22
import { db, spyUnbind, createOps } from '@posva/vuefire-test-helpers'
3-
import { firestore } from 'firebase'
3+
import firebase from 'firebase/app'
44
import { OperationsType } from '../../src/shared'
55

66
describe('documents', () => {
7-
let collection: firestore.CollectionReference,
8-
document: firestore.DocumentReference,
7+
let collection: firebase.firestore.CollectionReference,
8+
document: firebase.firestore.DocumentReference,
99
vm: Record<string, any>,
1010
resolve: (data: any) => void,
1111
reject: (error: any) => void,

packages/@posva/vuefire-core/__tests__/firestore/options.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import { bindDocument, firestoreOptions, bindCollection } from '../../src'
2-
import { db, createOps, CollectionReference, DocumentReference } from '@posva/vuefire-test-helpers'
3-
import { firestore } from 'firebase'
2+
import { db, createOps } from '@posva/vuefire-test-helpers'
3+
import firebase from 'firebase/app'
44

55
describe('options', () => {
6-
let collection: firestore.CollectionReference,
7-
document: firestore.DocumentReference,
6+
let collection: firebase.firestore.CollectionReference,
7+
document: firebase.firestore.DocumentReference,
88
vm: Record<string, any>,
99
resolve: (data: any) => void,
1010
reject: (error: any) => void

packages/@posva/vuefire-core/__tests__/firestore/refs-collections.spec.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
import { bindCollection, FirestoreOptions } from '../../src'
22
import { db, delay, spyUnbind, delayUpdate, createOps } from '@posva/vuefire-test-helpers'
33
import { OperationsType } from '../../src/shared'
4-
import { firestore } from 'firebase'
4+
import firebase from 'firebase/app'
55

66
describe('refs in collections', () => {
7-
let collection: firestore.CollectionReference,
8-
a: firestore.DocumentReference,
9-
b: firestore.DocumentReference,
7+
let collection: firebase.firestore.CollectionReference,
8+
a: firebase.firestore.DocumentReference,
9+
b: firebase.firestore.DocumentReference,
1010
vm: Record<string, any>,
1111
bind: (
1212
key: string,
13-
collection: firestore.CollectionReference,
13+
collection: firebase.firestore.CollectionReference,
1414
options?: FirestoreOptions
1515
) => void,
1616
unbind: () => void,

packages/@posva/vuefire-core/__tests__/firestore/refs-documents.spec.ts

+13-9
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,27 @@ import {
77
spyOnSnapshotCallback,
88
createOps,
99
} from '@posva/vuefire-test-helpers'
10-
import { firestore } from 'firebase'
10+
import firebase from 'firebase/app'
1111
import { OperationsType } from '../../src/shared'
1212

1313
describe('refs in documents', () => {
1414
// a and c existing objects { isA: true }
1515
// item is an empty ready to use object
1616
// empty is an empty object that is left empty
1717
// d has a ref to c
18-
let collection: firestore.CollectionReference,
19-
a: firestore.DocumentReference,
20-
b: firestore.DocumentReference,
21-
c: firestore.DocumentReference,
22-
d: firestore.DocumentReference,
23-
empty: firestore.DocumentReference,
24-
item: firestore.DocumentReference,
18+
let collection: firebase.firestore.CollectionReference,
19+
a: firebase.firestore.DocumentReference,
20+
b: firebase.firestore.DocumentReference,
21+
c: firebase.firestore.DocumentReference,
22+
d: firebase.firestore.DocumentReference,
23+
empty: firebase.firestore.DocumentReference,
24+
item: firebase.firestore.DocumentReference,
2525
vm: Record<string, any>,
26-
bind: (key: string, document: firestore.DocumentReference, options?: FirestoreOptions) => void,
26+
bind: (
27+
key: string,
28+
document: firebase.firestore.DocumentReference,
29+
options?: FirestoreOptions
30+
) => void,
2731
unbind: () => void,
2832
ops: OperationsType
2933

packages/global.d.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
declare module 'firebase-mock' {
2-
import { database } from 'firebase'
3-
2+
import firebase from 'firebase/app'
43
type TODO = any
54

65
interface MockFirebaseConstructor {
76
new (): MockFirebaseI
87
}
98

10-
export interface MockedReference extends database.Reference {
9+
export interface MockedReference extends firebase.database.Reference {
1110
flush: () => void
1211
forceCancel: (error: any) => void
1312
autoFlush: () => void

packages/vuexfire/__tests__/firestore.spec.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vuex from 'vuex'
22
import { vuexfireMutations, firestoreAction } from '../src'
33
import { db, tick, Vue, delayUpdate } from '@posva/vuefire-test-helpers'
4-
import { firestore } from 'firebase'
4+
import firebase from 'firebase/app'
55
import { FirestoreOptions } from '@posva/vuefire-core/dist/packages/@posva/vuefire-core/src'
66

77
Vue.use(Vuex)
@@ -36,18 +36,19 @@ describe('firestoreAction', () => {
3636
})
3737

3838
const setItems = (
39-
collection: firestore.CollectionReference | firestore.Query,
39+
collection: firebase.firestore.CollectionReference | firebase.firestore.Query,
4040
options?: FirestoreOptions
4141
) =>
4242
// @ts-ignore
4343
store.dispatch('action', ({ bindFirestoreRef }) =>
4444
bindFirestoreRef('items', collection, options)
4545
)
46-
const setItem = (document: firestore.DocumentReference) =>
46+
const setItem = (document: firebase.firestore.DocumentReference) =>
4747
// @ts-ignore
4848
store.dispatch('action', ({ bindFirestoreRef }) => bindFirestoreRef('item', document))
4949

50-
let collection: firestore.CollectionReference, document: firestore.DocumentReference
50+
let collection: firebase.firestore.CollectionReference,
51+
document: firebase.firestore.DocumentReference
5152
beforeEach(async () => {
5253
store.replaceState({
5354
// @ts-ignore

packages/vuexfire/__tests__/options.spec.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Vuex from 'vuex'
22
import { vuexfireMutations, firestoreAction } from '../src'
33
import { db, tick, Vue } from '@posva/vuefire-test-helpers'
4-
import { firestore } from 'firebase'
4+
import firebase from 'firebase/app'
55
import { FirestoreOptions } from '@posva/vuefire-core/dist/packages/@posva/vuefire-core/src'
66

77
Vue.use(Vuex)
@@ -27,18 +27,19 @@ describe('firestoreAction', () => {
2727
})
2828

2929
const setItems = (
30-
collection: firestore.CollectionReference | firestore.Query,
30+
collection: firebase.firestore.CollectionReference | firebase.firestore.Query,
3131
options?: FirestoreOptions
3232
) =>
3333
// @ts-ignore
3434
store.dispatch('action', ({ bindFirestoreRef }) =>
3535
bindFirestoreRef('items', collection, options)
3636
)
37-
const setItem = (document: firestore.DocumentReference, options?: FirestoreOptions) =>
37+
const setItem = (document: firebase.firestore.DocumentReference, options?: FirestoreOptions) =>
3838
// @ts-ignore
3939
store.dispatch('action', ({ bindFirestoreRef }) => bindFirestoreRef('item', document, options))
4040

41-
let collection: firestore.CollectionReference, document: firestore.DocumentReference
41+
let collection: firebase.firestore.CollectionReference,
42+
document: firebase.firestore.DocumentReference
4243
beforeEach(async () => {
4344
store.replaceState({
4445
// @ts-ignore

packages/vuexfire/__tests__/rtdb.spec.ts

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import Vuex from 'vuex'
22
import { firebaseAction, vuexfireMutations } from '../src'
33
import { MockFirebase, tick, Vue } from '@posva/vuefire-test-helpers'
4-
import { database } from 'firebase'
4+
import firebase from 'firebase/app'
5+
56
import { RTDBOptions } from '@posva/vuefire-core/dist/packages/@posva/vuefire-core/src'
67

78
Vue.use(Vuex)
@@ -37,14 +38,14 @@ describe('RTDB: firebaseAction', () => {
3738
},
3839
})
3940

40-
const setItems = (query: database.Query, options?: RTDBOptions) =>
41+
const setItems = (query: firebase.database.Query, options?: RTDBOptions) =>
4142
// @ts-ignore
4243
store.dispatch('action', ({ bindFirebaseRef }) => bindFirebaseRef('items', query, options))
43-
const setItem = (ref: database.Reference, options?: RTDBOptions) =>
44+
const setItem = (ref: firebase.database.Reference, options?: RTDBOptions) =>
4445
// @ts-ignore
4546
store.dispatch('action', ({ bindFirebaseRef }) => bindFirebaseRef('item', ref, options))
4647

47-
let collection: database.Reference, document: database.Reference
48+
let collection: firebase.database.Reference, document: firebase.database.Reference
4849
beforeEach(async () => {
4950
store.replaceState({
5051
items: [],

0 commit comments

Comments
 (0)