Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rxfire build fix #1085

Merged
merged 2 commits into from Aug 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 4 additions & 1 deletion packages/rxfire/.gitignore
Expand Up @@ -5,12 +5,15 @@

# generated declaration files
# declaration files currently break testing builds
# TODO: Fix TypeScript build setup before release
auth/index.d.ts
firestore/collection/index.d.ts
firestore/document/index.d.ts
firestore/fromRef.d.ts
firestore/index.d.ts
database/fromRef.d.ts
database/interfaces.d.ts
database/utils.d.ts
database/list/audit-trail.d.ts
functions/index.d.ts
index.d.ts
storage/index.d.ts
Expand Down
6 changes: 4 additions & 2 deletions packages/rxfire/package.json
Expand Up @@ -31,10 +31,12 @@
"browser": "dist/index.cjs.js",
"module": "dist/index.esm.js",
"peerDependencies": {
"firebase": "5.2.0",
"rxjs": "6.2.0"
"firebase": "^5.3.0",
"rxjs": "^6.2.2"
},
"devDependencies": {
"firebase": "^5.3.0",
"rxjs": "^6.2.2",
"rollup": "0.57.1",
"rollup-plugin-commonjs": "9.1.0",
"rollup-plugin-node-resolve": "3.3.0",
Expand Down
10 changes: 5 additions & 5 deletions packages/rxfire/test/firestore.test.ts
Expand Up @@ -18,7 +18,7 @@ import { initializeApp, firestore, app } from 'firebase/app';
import 'firebase/firestore';
import {
collection,
docChanges,
collectionChanges,
sortedChanges,
auditTrail,
docData,
Expand Down Expand Up @@ -112,7 +112,7 @@ describe('RxFire Firestore', () => {
});
});

describe('docChanges', () => {
describe('collectionChanges', () => {
/**
* The `stateChanges()` method emits a stream of events as they
* occur rather than in sorted order.
Expand All @@ -124,8 +124,8 @@ describe('RxFire Firestore', () => {
const { colRef, davidDoc } = seedTest(firestore);

davidDoc.set({ name: 'David' });
const firstChange = docChanges(colRef).pipe(take(1));
const secondChange = docChanges(colRef).pipe(skip(1));
const firstChange = collectionChanges(colRef).pipe(take(1));
const secondChange = collectionChanges(colRef).pipe(skip(1));

firstChange.subscribe(change => {
expect(change[0].type).to.eq('added');
Expand All @@ -141,7 +141,7 @@ describe('RxFire Firestore', () => {

describe('sortedChanges', () => {
/**
* The `sortedChanges()` method reduces the stream of `docChanges()` to
* The `sortedChanges()` method reduces the stream of `collectionChanges()` to
* a sorted array. This test seeds two "people" and checks to make sure
* the 'added' change type exists. Afterwards, one "person" is modified.
* The test then checks that the person is modified and in the proper sorted
Expand Down