kylefang/react-native-firebase
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native-firebase.git synced 2026-04-30 05:05:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/observable

Browse Source
This commit is contained in:
Mike Hardy
2020-08-14 18:08:09 -05:00
committed by GitHub
parent 77f2a127bc 62ee961d6e
commit 681bf2e452
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/publish.yml vendored
View File

@@ -1,13 +1,14 @@
name: Publish name: Publish
on: on:
workflow_dispatch:
push: push:
branches: branches:
- master - master
jobs: jobs:
publish_npm: publish_npm:
if: "contains(toJSON(github.event.commits.*.message), '[publish]')" if: "(github.event_name == 'workflow_displatch') || ((github.event_name == 'push') && contains(toJSON(github.event.commits.*.message), '[publish]'))"
name: 'NPM' name: 'NPM'
timeout-minutes: 5 timeout-minutes: 5
runs-on: ubuntu-latest runs-on: ubuntu-latest

4
packages/firestore/e2e/Query/onSnapshot.e2e.js
View File

@@ -338,7 +338,9 @@ describe('firestore().collection().onSnapshot()', () => {
} }
}); });
it('unsubscribes from further updates', async () => { // FIXME test disabled due to flakiness in CI E2E tests.
// Registered 4 of 3 expected calls once (!?), 3 of 2 expected calls once.
xit('unsubscribes from further updates', async () => {
const callback = sinon.spy(); const callback = sinon.spy();
const collection = firebase.firestore().collection('v6/foo/bar7'); const collection = firebase.firestore().collection('v6/foo/bar7');

4
packages/messaging/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m
View File

@@ -75,7 +75,9 @@ struct {
// TODO in a later version allow customising completion options in JS code // TODO in a later version allow customising completion options in JS code
completionHandler(UNNotificationPresentationOptionNone); completionHandler(UNNotificationPresentationOptionNone);
} else if (_originalDelegate != nil && originalDelegateRespondsTo.willPresentNotification) { }
if (_originalDelegate != nil && originalDelegateRespondsTo.willPresentNotification) {
[_originalDelegate userNotificationCenter:center willPresentNotification:notification withCompletionHandler:completionHandler]; [_originalDelegate userNotificationCenter:center willPresentNotification:notification withCompletionHandler:completionHandler];
} else { } else {
completionHandler(UNNotificationPresentationOptionNone); completionHandler(UNNotificationPresentationOptionNone);