Make destroy wait for unsubscribe

Author: gkubisa

lib/client/doc.js

@@ -105,10 +105,15 @@ Doc.prototype.destroy = function(callback) {
   var doc = this;
   doc.whenNothingPending(function() {
     if (doc.wantSubscribe) {
-      doc.unsubscribe();
+      doc.unsubscribe(function(err) {
+        if (!err) doc.connection._destroyDoc(doc);
+        if (callback) return callback(err);
+        if (err) this.emit('error', err); 
+      });
+    } else {
+      doc.connection._destroyDoc(doc);
+      if (callback) callback();
     }
-    doc.connection._destroyDoc(doc);
-    if (callback) callback();
   });
 };
 

test/client/subscribe.js

@@ -414,7 +414,7 @@ describe('client subscribe', function() {
       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);
@@ -425,6 +425,17 @@ describe('client subscribe', function() {
     });
   });
 
+  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();