Bug 832376 - The default icon doesn't appear when manifest has an inv…

…alid icon URL - stays in "downloading" mode r=daleharvey a=tef+

- fix homescreen tests, had to change the TextOverflowDetective for that
- Don't use the stored old rendered icon if it's not a proper blob.

apps/homescreen/js/page.js

@@ -183,8 +183,9 @@ Icon.prototype = {
   },
 
   loadCachedIcon: function icon_loadCachedImage() {
-    if ('oldRenderedIcon' in this.descriptor) {
-      this.renderBlob(this.descriptor.oldRenderedIcon);
+    var oldRenderedIcon = this.descriptor.oldRenderedIcon;
+    if (oldRenderedIcon && oldRenderedIcon instanceof Blob) {
+      this.renderBlob(oldRenderedIcon);
     } else {
       this.loadImageData();
     }
@@ -823,14 +824,25 @@ dockProto.getChildren = function dk_getChildren() {
 HTMLCollection.prototype.indexOf = Array.prototype.indexOf;
 
 const TextOverflowDetective = (function() {
-  var iconFakeWrapperWidht = document.querySelector('#fake-icon-name-wrapper').
-                                                                    offsetWidth;
-  var iconFakeLabel = document.querySelector('#fake-icon-name');
 
-  return {
-    check: function od_check(text) {
-      iconFakeLabel.textContent = text;
-      return iconFakeLabel.offsetWidth >= iconFakeWrapperWidht;
+  var iconFakeWrapperWidth;
+  var iconFakeLabel;
+
+  function init() {
+    var fakeIconName = document.querySelector('#fake-icon-name-wrapper');
+    iconFakeWrapperWidth = fakeIconName.offsetWidth;
+    iconFakeLabel = document.querySelector('#fake-icon-name');
+  }
+
+  function check(text) {
+    if (! iconFakeLabel || ! iconFakeWrapperWidth) {
+      init();
     }
+    iconFakeLabel.textContent = text;
+    return iconFakeLabel.offsetWidth >= iconFakeWrapperWidth;
   }
+
+  return {
+    check: check
+  };
 })();

apps/homescreen/test/unit/page_test.js

@@ -1,3 +1,5 @@
+'use strict';
+
 requireApp('homescreen/test/unit/mock_app.js');
 requireApp('homescreen/test/unit/mock_xmlhttprequest.js');
 requireApp('homescreen/test/unit/mock_grid_manager.js');
@@ -19,7 +21,7 @@ mocksForHomescreenPageTest.forEach(function(mockName) {
 suite('page.js >', function() {
   var mocksHelper;
 
-  var SMALL_TIMEOUT = 100;
+  var containerNode;
 
   suiteSetup(function() {
     mocksHelper = new MocksHelper(mocksForHomescreenPageTest);
@@ -28,10 +30,23 @@ suite('page.js >', function() {
 
   setup(function() {
     mocksHelper.setup();
+
+    var fakeIconMarkup =
+      '<div id="fake-icon">' +
+        '<span id="fake-icon-name-wrapper" class="labelWrapper">' +
+          '<span id="fake-icon-name"></span>' +
+        '</span>' +
+      '</div>';
+
+    containerNode = document.createElement('div');
+    containerNode.innerHTML = fakeIconMarkup;
+    document.body.appendChild(containerNode);
   });
 
   teardown(function() {
     mocksHelper.teardown();
+
+    containerNode.parentNode.removeChild(containerNode);
   });
 
   suiteTeardown(function() {
@@ -136,6 +151,51 @@ suite('page.js >', function() {
         });
       });
 
+      suite('http url icon, wrong old rendered icon >', function() {
+        var anIconAsHttpUrl = 'http://some.icon.name/icon.png';
+
+        setup(function() {
+          var app = new MockApp();
+          descriptor = {
+            manifestURL: app.manifestURL,
+            name: app.name,
+            icon: anIconAsHttpUrl,
+            oldRenderedIcon: undefined
+          };
+
+          icon = new Icon(descriptor, app);
+        });
+
+        suite('XHR works fine >', function() {
+          setup(function() {
+            icon.render(iconsContainer);
+          });
+
+          test('icon should be rendered', function() {
+            // note: this doesn't test if the icon is actually displayed
+            // but merely that we don't fail somewhere
+            assert.equal(iconsContainer.querySelectorAll('li').length, 1);
+          });
+
+          test('should load the icon with XHR', function() {
+            assert.equal(MockXMLHttpRequest.mLastOpenedUrl, anIconAsHttpUrl);
+          });
+        });
+
+
+        suite('XHR throws an exception >', function() {
+          setup(function() {
+            MockXMLHttpRequest.mThrowAtNextSend();
+            icon.render(iconsContainer);
+          });
+          test('icon should still be rendered', function() {
+            // note: this doesn't test if the icon is actually displayed
+            // but merely that we don't fail somewhere
+            assert.equal(iconsContainer.querySelectorAll('li').length, 1);
+          });
+        });
+      });
+
 
     });