From 694ff9915890d6328a9fdc32e11a9f236c298eb7 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Fri, 14 Aug 2020 16:45:05 -0500 Subject: [PATCH 1/3] chore: add manual publish capability to workflow (#4090) --- .github/workflows/publish.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 9fce21e5..52a7858d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -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 From 6e7c3b20024c7e90bf8998ba018c6bd2efa0a562 Mon Sep 17 00:00:00 2001 From: Mike Hardy Date: Fri, 14 Aug 2020 17:30:28 -0500 Subject: [PATCH 2/3] tests(firestore): disable flaky onSnapshot unsubscribe e2e test (#4091) --- packages/firestore/e2e/Query/onSnapshot.e2e.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/firestore/e2e/Query/onSnapshot.e2e.js b/packages/firestore/e2e/Query/onSnapshot.e2e.js index f5ff2857..7fb36182 100644 --- a/packages/firestore/e2e/Query/onSnapshot.e2e.js +++ b/packages/firestore/e2e/Query/onSnapshot.e2e.js @@ -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'); From 62ee961d6ebffe529bdfa938443e1f25a0201e0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=E1=BA=A7n=20Trung=20Ki=C3=AAn?= Date: Sat, 15 Aug 2020 06:07:34 +0700 Subject: [PATCH 3/3] fix(messaging, ios): call original delegate when intercepting willPresentNotification (#4088) --- .../RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/messaging/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m b/packages/messaging/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m index 0269284b..541114d9 100644 --- a/packages/messaging/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m +++ b/packages/messaging/ios/RNFBMessaging/RNFBMessaging+UNUserNotificationCenter.m @@ -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);