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.

Sign up for GitHub

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

Jump to bottom

fix(database): call cancellation callback when using ref.on #5371

Merged
merged 4 commits into from
Jul 16, 2021
Merged

fix(database): call cancellation callback when using ref.on #5371

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da65ca5
call cancellation callback when using ref.on
nealmanaktola May 28, 2021
cbe4da6
lint fix
nealmanaktola May 28, 2021
d47e097
unskip test
nealmanaktola Jun 5, 2021
5c67b52
Update packages/database/lib/DatabaseSyncTree.js
mikehardy Jul 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/database/e2e/query/on.e2e.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('database().ref().on()', function () {
});

// the cancelCallback is never called for ref.on but ref.once works?
xit('should cancel when something goes wrong', async function () {
it('should cancel when something goes wrong', async function () {
const successCallback = sinon.spy();
const cancelCallback = sinon.spy();
const ref = firebase.database().ref('nope');
Expand Down
7 changes: 6 additions & 1 deletion packages/database/lib/DatabaseSyncTree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,12 @@ class DatabaseSyncTree {

if (once) {
const subscription = SharedEventEmitter.addListener(eventRegistrationKey, event => {
this._onOnceRemoveRegistration(eventRegistrationKey, listener, event);
const wrappedListener = this._onOnceRemoveRegistration(
eventRegistrationKey,
listener,
event,
);
wrappedListener(event);
mikehardy marked this conversation as resolved.
Show resolved Hide resolved
mikehardy marked this conversation as resolved.
Show resolved Hide resolved
subscription.remove();
});
} else {
Expand Down