Merge pull request #23072 from crdlc/bug-1055324

Bug 1055324 - [B2G][OTA][1.3 -> 2.0] E.Me apps on the homescreen do not ...

apps/homescreen/js/grid_components.js

@@ -201,9 +201,9 @@ Collection.prototype = {
         });
       } else {
         // If E.me has not been initialzed for the smart collections,
-        // we early-return. We let the default smart collections be populated
+        // we skip migration. We let the default smart collections be populated
         // for the vertical homescreen instead.
-        return;
+        descriptor.skipMigration = true;
       }
       var categoryId = descriptor.categoryId || this.providerId;
       var id = parseInt(categoryId);

apps/homescreen/js/migrator.js

@@ -91,8 +91,12 @@
         GridItemsFactory.create(icon).getDescriptor(function(descriptor) {
           icon.record.id = descriptor.type === types.COLLECTION ?
                            descriptor.id : descriptor.url;
-          console.debug('Migrated to datastore', JSON.stringify(descriptor));
-          database.add(descriptor).then(onItemMigrated, onItemMigrated);
+          if (descriptor.skipMigration) {
+            onItemMigrated();
+          } else {
+            console.debug('Migrated to datastore', JSON.stringify(descriptor));
+            database.add(descriptor).then(onItemMigrated, onItemMigrated);
+          }
         });
       }.bind(this));
 

apps/homescreen/test/unit/migrator_test.js

@@ -528,4 +528,45 @@ suite('migrator.js >', function() {
     startMigration();
   });
 
+  test('Skip CollectionsDatabase when E.me has not been initialzed',
+    function(done) {
+    var page = {
+      'index': 0,
+      'icons': [ createIcon('collection', {
+                   type: GridItemsFactory.TYPE.COLLECTION,
+                   provider_id: 234
+                 }),
+                 createIcon('app')
+               ]
+    };
+
+    port.postMessage = function(msg) {
+      assert.equal(msg, 'Done');
+
+      assert.isFalse(bdAddStub.called);
+      assert.equal(bookmarks.length, 0);
+
+      assert.isFalse(cdAddStub.called);
+      assert.equal(collections.length, 0);
+
+      assert.isTrue(vpPutStub.called);
+      var firstPage = layout.grid[0];
+      assert.equal(firstPage.length, 2);
+      assert.equal(firstPage[0].id, 234);
+      assert.equal(firstPage[0].role, GridItemsFactory.TYPE.COLLECTION);
+      assert.equal(firstPage[1].name, 'app');
+      done();
+    };
+
+    var stub = sinon.stub(HomeState, 'getGrid', function(iterator, success) {
+      stub.restore();
+      iterator(page);
+      success();
+    });
+
+    window.asyncStorage.keys['evme-collectionsettings_idcollection'] = {};
+
+    startMigration();
+  });
+
 });