Bug 1155701 - merge pull request #29572 from julienw:1155701-app-no-a…

…ctivity to mozilla-b2g:master

apps/system/js/activities.js

@@ -19,6 +19,15 @@
   Activities.prototype = {
     /** @lends Activities */
 
+    /**
+     * Remove all event listeners. This is mainly used in unit tests.
+     */
+    destroy: function() {
+      window.removeEventListener('mozChromeEvent', this);
+      window.removeEventListener('appopened', this);
+      window.removeEventListener('applicationinstall', this);
+    },
+
     /**
     * General event handler interface.
     * Updates the overlay with as we receive load events.
@@ -48,6 +57,9 @@
 
     _onNewAppInstalled: function(app) {
       var activities = app && app.manifest && app.manifest.activities;
+      if (!activities) {
+        return;
+      }
 
       Object.keys(activities).forEach(function(activity) {
         var filters = activities[activity].filters;

apps/system/test/unit/activities_test.js

@@ -390,6 +390,20 @@ suite('system/Activities', function() {
       subject = new Activities();
     });
 
+    teardown(function() {
+      subject.destroy();
+    });
+
+    test('correctly handles apps without activities', function() {
+      var appWithoutActivities = {
+        'manifest': {}
+      };
+
+      assert.doesNotThrow(
+        () => subject._onNewAppInstalled(appWithoutActivities)
+      );
+    });
+
     test('manages the default launch for the app\'s activities', function() {
       DefaultActivityHelper.getDefaultAction
         .returns({ // instead of Promise.resolve() to return in same cycle