Bug 819548 - Remember sys updates are available after reboot

We then prompt for updates on startup

apps/system/js/updatable.js

@@ -128,9 +128,16 @@ function SystemUpdatable() {
   this.size = 0;
   this.downloading = false;
   this.paused = false;
+
+  this.checkKnownUpdate(function checkCallback() {
+    UpdateManager.checkForUpdates(true);
+  });
+
   window.addEventListener('mozChromeEvent', this);
 }
 
+SystemUpdatable.KNOWN_UPDATE_FLAG = 'known-sysupdate';
+
 SystemUpdatable.prototype.download = function() {
   if (this.downloading) {
     return;
@@ -202,6 +209,9 @@ SystemUpdatable.prototype.errorCallBack = function() {
 SystemUpdatable.prototype.showApplyPrompt = function() {
   var _ = navigator.mozL10n.get;
 
+  // Update will be completed after restart
+  this.forgetKnownUpdate();
+
   var cancel = {
     title: _('later'),
     callback: this.declineInstall.bind(this)
@@ -229,6 +239,25 @@ SystemUpdatable.prototype.acceptInstall = function() {
   this._dispatchEvent('update-prompt-apply-result', 'restart');
 };
 
+SystemUpdatable.prototype.rememberKnownUpdate = function() {
+  asyncStorage.setItem(SystemUpdatable.KNOWN_UPDATE_FLAG, true);
+};
+
+SystemUpdatable.prototype.checkKnownUpdate = function(callback) {
+  if (typeof callback !== 'function') {
+    return;
+  }
+  asyncStorage.getItem(SystemUpdatable.KNOWN_UPDATE_FLAG, function(value) {
+    if (value) {
+      callback();
+    }
+  });
+};
+
+SystemUpdatable.prototype.forgetKnownUpdate = function() {
+  asyncStorage.removeItem(SystemUpdatable.KNOWN_UPDATE_FLAG);
+};
+
 SystemUpdatable.prototype._dispatchEvent = function(type, result) {
   var event = document.createEvent('CustomEvent');
   var data = { type: type };

apps/system/js/update_manager.js

@@ -472,6 +472,7 @@ var UpdateManager = {
 
     if (detail.type && detail.type === 'update-available') {
       this.systemUpdatable.size = detail.size;
+      this.systemUpdatable.rememberKnownUpdate();
       this.addToUpdatesQueue(this.systemUpdatable);
     }
   },

apps/system/test/unit/mock_asyncStorage.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var MockasyncStorage = {
+    mItems: {},
+
+    setItem: function(key, value, callback) {
+        this.mItems[key] = value;
+        if (typeof callback === 'function') {
+          callback();
+        }
+    },
+
+    getItem: function(key, callback) {
+      var value = this.mItems[key] || null;
+      if (typeof callback === 'function') {
+        callback(value);
+      }
+    },
+
+    removeItem: function(key, callback) {
+      if (key in this.mItems) {
+        delete this.mItems[key];
+      }
+
+      if (typeof callback === 'function') {
+        callback();
+      }
+    },
+
+    mTeardown: function() {
+      this.mItems = {};
+    }
+};

apps/system/test/unit/mock_updatable.js

@@ -41,6 +41,7 @@ function MockSystemUpdatable(downloadSize) {
 MockSystemUpdatable.mInstancesCount = 0;
 MockSystemUpdatable.mTeardown = function() {
   MockSystemUpdatable.mInstancesCount = 0;
+  delete MockSystemUpdatable.mKnownUpdate;
 };
 
 
@@ -55,3 +56,17 @@ MockSystemUpdatable.prototype.download = function() {
 MockSystemUpdatable.prototype.cancelDownload = function() {
   this.mCancelCalled = true;
 };
+
+MockSystemUpdatable.prototype.rememberKnownUpdate = function() {
+  this.mKnownUpdate = true;
+};
+
+MockSystemUpdatable.prototype.forgetKnownUpdate = function() {
+  delete this.mKnownUpdate;
+};
+
+MockSystemUpdatable.prototype.checkKnownUpdate = function(callback) {
+  if (this.mKnownUpdate && typeof callback === 'function') {
+    callback();
+  }
+};

apps/system/test/unit/mock_update_manager.js

@@ -33,13 +33,18 @@ var MockUpdateManager = {
     this.mErrorBannerRequested = true;
   },
 
+  checkForUpdates: function mum_checkForUpdate(forced) {
+    this.mCheckForUpdatesCalledWith = forced;
+  },
+
   mErrorBannerRequested: false,
   mLastUpdatesAdd: null,
   mLastUpdatableAdd: null,
   mLastUpdatesRemoval: null,
   mLastDownloadsAdd: null,
   mLastDownloadsRemoval: null,
   mProgressCalledWith: null,
+  mCheckForUpdatesCalledWith: null,
   mStartedUncompressingCalled: false,
   mTeardown: function mum_mTeardown() {
     this.mErrorBannerRequested = false;
@@ -49,6 +54,7 @@ var MockUpdateManager = {
     this.mLastDownloadsAdd = null;
     this.mLastDownloadsRemoval = null;
     this.mProgressCalledWith = null;
+    this.mCheckForUpdatesCalledWith = null;
     this.mStartedUncompressingCalled = false;
   }
 };

apps/system/test/unit/updatable_test.js

@@ -3,6 +3,7 @@
 requireApp('system/js/updatable.js');
 
 requireApp('system/test/unit/mock_app.js');
+requireApp('system/test/unit/mock_asyncStorage.js');
 requireApp('system/test/unit/mock_update_manager.js');
 requireApp('system/test/unit/mock_window_manager.js');
 requireApp('system/test/unit/mock_apps_mgmt.js');
@@ -18,7 +19,8 @@ var mocksForUpdatable = [
   'UpdateManager',
   'WindowManager',
   'UtilityTray',
-  'ManifestHelper'
+  'ManifestHelper',
+  'asyncStorage'
 ];
 
 mocksForUpdatable.forEach(function(mockName) {
@@ -124,6 +126,12 @@ suite('system/Updatable', function() {
       assert.equal(MockUpdateManager.mLastUpdatableAdd, subject);
     });
 
+    test('should remember about the update on startup', function() {
+      asyncStorage.mItems[SystemUpdatable.KNOWN_UPDATE_FLAG] = true;
+      var systemUpdatable = new SystemUpdatable();
+      assert.equal(MockUpdateManager.mCheckForUpdatesCalledWith, true);
+    });
+
     downloadAvailableSuite('app has a download available', function() {
       mockApp.downloadAvailable = true;
       subject = new AppUpdatable(mockApp);
@@ -229,6 +237,7 @@ suite('system/Updatable', function() {
 
     suite('cancel system update download', function() {
       setup(function() {
+        asyncStorage.setItem(SystemUpdatable.KNOWN_UPDATE_FLAG, true);
         subject = new SystemUpdatable(42);
         subject.download();
         subject._dispatchEvent = fakeDispatchEvent;
@@ -431,6 +440,7 @@ suite('system/Updatable', function() {
 
       suite('update-downloaded', function() {
         setup(function() {
+          asyncStorage.setItem(SystemUpdatable.KNOWN_UPDATE_FLAG, true);
           var event = new MockChromeEvent({
             type: 'update-downloaded'
           });
@@ -441,18 +451,27 @@ suite('system/Updatable', function() {
           assert.isFalse(subject.downloading);
         });
 
+        test('should reset SystemUpdatable.KNOWN_UPDATE_FLAG', function() {
+          assert.isUndefined(asyncStorage.mItems[SystemUpdatable.KNOWN_UPDATE_FLAG]);
+        });
+
         testSystemApplyPrompt();
       });
 
       suite('update-prompt-apply', function() {
         setup(function() {
+          asyncStorage.setItem(SystemUpdatable.KNOWN_UPDATE_FLAG, true);
           MockUtilityTray.show();
           var event = new MockChromeEvent({
             type: 'update-prompt-apply'
           });
           subject.handleEvent(event);
         });
 
+        test('should reset SystemUpdatable.KNOWN_UPDATE_FLAG', function() {
+          assert.isUndefined(asyncStorage.mItems[SystemUpdatable.KNOWN_UPDATE_FLAG]);
+        });
+
         testSystemApplyPrompt();
       });
 
@@ -508,7 +527,7 @@ suite('system/Updatable', function() {
               progress: 1234,
               total: 98734
             });
-          })
+          });
 
           test('should send progress to update manager', function() {
             subject.handleEvent(event);
@@ -525,6 +544,7 @@ suite('system/Updatable', function() {
 
         suite('when the download is paused', function() {
           setup(function() {
+            asyncStorage.setItem(SystemUpdatable.KNOWN_UPDATE_FLAG, true);
             event = new MockChromeEvent({
               type: 'update-download-stopped',
               paused: true
@@ -538,10 +558,14 @@ suite('system/Updatable', function() {
           test('shouldn\'t signal "started uncompressing"', function() {
             assert.isFalse(MockUpdateManager.mStartedUncompressingCalled);
           });
+          test('should not reset SystemUpdatable.KNOWN_UPDATE_FLAG', function() {
+            assert.isTrue(asyncStorage.mItems[SystemUpdatable.KNOWN_UPDATE_FLAG]);
+          });
         });
 
         suite('when the download is complete', function() {
           setup(function() {
+            asyncStorage.setItem(SystemUpdatable.KNOWN_UPDATE_FLAG, true);
             event = new MockChromeEvent({
               type: 'update-download-stopped',
               paused: false
@@ -556,6 +580,9 @@ suite('system/Updatable', function() {
           test('should signal the UpdateManager', function() {
             assert.isTrue(MockUpdateManager.mStartedUncompressingCalled);
           });
+          test('should not reset SystemUpdatable.KNOWN_UPDATE_FLAG', function() {
+            assert.isTrue(asyncStorage.mItems[SystemUpdatable.KNOWN_UPDATE_FLAG]);
+          });
         });
       });
     });

apps/system/test/unit/update_manager_test.js

@@ -335,7 +335,22 @@ suite('system/UpdateManager', function() {
         assert.equal(UpdateManager.updatesQueue.length, initialLength);
         assert.equal(MockSystemUpdatable.mInstancesCount, 1);
       });
+
+      test('should remember that update is available', function() {
+        assert.isTrue(UpdateManager.systemUpdatable.mKnownUpdate);
+      });
+    });
+
+    suite('no system update available', function() {
+      setup(function() {
+        UpdateManager.init();
+      });
+
+      test('should not remember about the update', function() {
+          assert.isUndefined(UpdateManager.systemUpdatable.mKnownUpdate);
+      });
     });
+
   });
 
   suite('UI', function() {