Merge pull request #126 from brave/fix/107

fix discrepancy between Android and Laptop RESOLVED_SYNC_RECORDS

Author: ayumi

client/recordUtil.js

@@ -114,6 +114,17 @@ const pickFields = (object, fields) => {
   }, {})
 }
 
+/**
+ * Converts [] parentFolderObjectIds fields to null in place. Fix #107.
+ * @param {Object} record
+ */
+const normalizeBookmark = (record) => {
+  if (record && record.bookmark && record.bookmark.parentFolderObjectId &&
+    !record.bookmark.parentFolderObjectId.length) {
+    record.bookmark.parentFolderObjectId = null
+  }
+}
+
 /**
  * Given a SyncRecord and a browser's matching existing object, resolve
  * objectData to the final object that should be applied by the browser.
@@ -262,6 +273,12 @@ const mergeRecords = (recordsAndObjects) => {
  */
 module.exports.resolveRecords = (recordsAndExistingObjects) => {
   let resolvedRecords = []
+  recordsAndExistingObjects.forEach((item) => {
+    if (item) {
+      normalizeBookmark(item[0])
+      normalizeBookmark(item[1])
+    }
+  })
   const merged = mergeRecords(recordsAndExistingObjects)
   merged.forEach(([record, existingObject]) => {
     const resolved = this.resolve(record, existingObject)

package.json

@@ -68,6 +68,7 @@
   "standard": {
     "ignore": [
       "test/crypto.js",
+      "test/client/fixtures/*.js",
       "bundles/*.js",
       "client/polyfill/*.js",
       "lib/api.proto.js",