Merge pull request #1160 from iLiviu/bugfix/1150-baseclient.remove_while_offline

do not return common revision if local node was marked for deletion

Author: Sebastian Kippe

src/cachinglayer.js

@@ -32,8 +32,13 @@ function getLatest(node) {
       return node.common;
     }
   } else {
-    if (node.local && node.local.body && node.local.contentType) {
-      return node.local;
+    if (node.local) {
+      if (node.local.body && node.local.contentType) {
+        return node.local;
+      }
+      if (node.local.body === false) {
+        return;
+      }
     }
     if (node.common && node.common.body && node.common.contentType) {
       return node.common;

test/unit/cachinglayer-suite.js

@@ -54,6 +54,13 @@ define(['require', './src/util', './src/config', './src/inmemorystorage'], funct
             body:        'asdf',
             contentType: 'text/plain'
           };
+          deletedLocalNode = {
+            path:   '/a/b',
+            local:  { body: false },
+            common: { body: 'b', contentType: 'c' },
+            push:   { foo: 'bar' },
+            remote: { foo: 'bar' }
+          }
 
           test.assertAnd(getLatest(undefined), undefined);
           test.assertAnd(getLatest({local: { revision: 1, timestamp: 1 }}), undefined);
@@ -63,6 +70,7 @@ define(['require', './src/util', './src/config', './src/inmemorystorage'], funct
           test.assertAnd(getLatest(commonNode).contentType, 'c');
           test.assertAnd(getLatest(legacyNode).body, 'asdf');
           test.assertAnd(getLatest(legacyNode).contentType, 'text/plain');
+          test.assertAnd(getLatest(deletedLocalNode), undefined);
           test.done();
         }
       },