Skip to content

Fix Doc.prototype.destroy #204

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

Merged
merged 8 commits into from
Jul 23, 2018
Merged

Fix Doc.prototype.destroy #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
8705c4f
Fix Doc.prototype.destroy
gkubisa Apr 18, 2018
af84be6
Update tested nodejs versions in .travis.yml
gkubisa Apr 18, 2018
09edf92
Add a test
gkubisa Apr 19, 2018
c15448f
Merge 'upstream/master' into fix-doc-destroy
gkubisa Jun 11, 2018
15cdd1d
Update tested nodejs versions
gkubisa Jul 12, 2018
cfca37f
Make destroy wait for unsubscribe
gkubisa Jul 12, 2018
5e009d1
Simplify the code
gkubisa Jul 12, 2018
c26c79b
Merge branch 'master' into fix-doc-destroy
nateps Jul 23, 2018
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
15 changes: 12 additions & 3 deletions lib/client/doc.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,20 @@ emitter.mixin(Doc);
Doc.prototype.destroy = function(callback) {
var doc = this;
doc.whenNothingPending(function() {
doc.connection._destroyDoc(doc);
if (doc.wantSubscribe) {
return doc.unsubscribe(callback);
doc.unsubscribe(function(err) {
if (err) {
if (callback) callback(err);
else this.emit('error', err);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be doc. I'll just go ahead and merge this change and make the fix, since we're close.

return;
}
doc.connection._destroyDoc(doc);
if (callback) callback();
});
} else {
doc.connection._destroyDoc(doc);
if (callback) callback();
}
if (callback) callback();
});
};

Expand Down
20 changes: 17 additions & 3 deletions test/client/subscribe.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,23 +405,37 @@ describe('client subscribe', function() {
});

it('doc destroy stops op updates', function(done) {
var doc = this.backend.connect().get('dogs', 'fido');
var doc2 = this.backend.connect().get('dogs', 'fido');
var connection1 = this.backend.connect();
var connection2 = this.backend.connect();
var doc = connection1.get('dogs', 'fido');
var doc2 = connection2.get('dogs', 'fido');
doc.create({age: 3}, function(err) {
if (err) return done(err);
doc2.subscribe(function(err) {
if (err) return done(err);
doc2.on('op', function(op, context) {
done();
done(new Error('Should not get op event'));
});
doc2.destroy(function(err) {
if (err) return done(err);
expect(connection2.getExisting('dogs', 'fido')).equal(undefined);
doc.submitOp({p: ['age'], na: 1}, done);
});
});
});
});

it('doc destroy removes doc from connection when doc is not subscribed', function(done) {
var connection = this.backend.connect();
var doc = connection.get('dogs', 'fido');
expect(connection.getExisting('dogs', 'fido')).equal(doc);
doc.destroy(function(err) {
if (err) return done(err);
expect(connection.getExisting('dogs', 'fido')).equal(undefined);
done();
});
});

it('bulk unsubscribe stops op updates', function(done) {
var connection = this.backend.connect();
var connection2 = this.backend.connect();
Expand Down