Merge pull request #34160 from weilonge/seanlee/DataSync/master/Bug12…

…56227

Bug 1256227 - Add last_modified property into Tabs sync record. r=michielbdejong

apps/sync/js/adapters/tabs.js

@@ -316,15 +316,18 @@ DataAdapters.tabs = {
   }
 **/
 
-  _updateTab(payload, userid) {
+  _updateDeviceTabsList(payload, last_modified, userid) {
     if (!payload.clientName || typeof payload.clientName !== 'string' ||
         !payload.id || typeof payload.id !== 'string' ||
         !payload.tabs || !Array.isArray(payload.tabs)) {
       console.warn('Incorrect payload?', payload);
       return Promise.resolve();
     }
 
-    return TabsHelper.addTab(payload, userid);
+    var record = payload;
+    record.timestamp = last_modified;
+
+    return TabsHelper.addTab(record, userid);
   },
 
   _next(remoteRecords, lastModifiedTime, userid, cursor) {
@@ -339,8 +342,8 @@ DataAdapters.tabs = {
       return Promise.resolve();
     }
 
-    return this._updateTab(remoteRecords[cursor].payload, userid)
-        .then(() => {
+    return this._updateDeviceTabsList(remoteRecords[cursor].payload,
+        remoteRecords[cursor].last_modified, userid).then(() => {
       return this._next(remoteRecords, lastModifiedTime, userid, cursor + 1);
     });
   },

apps/sync/test/unit/adapters/tabs_test.js

@@ -44,6 +44,8 @@ suite('sync/adapters/tabs >', function() {
 
   function verifyTabs(remoteItem, localItem) {
     assert.deepEqual(remoteItem.payload, localItem);
+    assert.isNumber(localItem.timestamp);
+    assert.equal(remoteItem.last_modified, localItem.timestamp);
   }
 
   function testDataGenerator(initIndex, initDate, count) {