Merge branch 'master' into fix/observable

This commit is contained in:
Mike Hardy
2020-08-14 18:08:09 -05:00
committed by GitHub
3 changed files with 8 additions and 3 deletions

View File

@@ -1,13 +1,14 @@
name: Publish
on:
workflow_dispatch:
push:
branches:
- master
jobs:
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'
timeout-minutes: 5
runs-on: ubuntu-latest

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 collection = firebase.firestore().collection('v6/foo/bar7');

View File

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