Merge pull request #33372 from bzbarsky/more-promise-bustage

Bug 1228239 - Fix more misuse of Promise static methods in Gaia unit tests
mozilla-b2g · Nov 30, 2015 · 83ab258 · 83ab258
2 parents 05b6e39 + 2fb2ad6
commit 83ab258
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/apps/homescreen/test/unit/apps_test.js b/apps/homescreen/test/unit/apps_test.js
@@ -509,15 +509,15 @@ suite('Homescreen app', () => {
 
     test('calls IconsHelper.setElementIcon() on bookmark icons', () => {
       var setElementIconStub = sinon.stub(MockIconsHelper, 'setElementIcon',
-                                          Promise.resolve);
+                                          Promise.resolve.bind(Promise));
       app.refreshIcon(mockBookmarkIcon);
       assert.isTrue(setElementIconStub.calledOnce);
       setElementIconStub.restore();
     });
 
     test('calls refresh if setElementIcon() Promise rejects', done => {
       var setElementIconStub = sinon.stub(MockIconsHelper, 'setElementIcon',
-                                          Promise.reject);
+                                          Promise.reject.bind(Promise));
       sinon.stub(mockBookmarkIcon, 'refresh', () => {
         setElementIconStub.restore();
         done();

diff --git a/shared/js/icons_helper.js b/shared/js/icons_helper.js
@@ -174,10 +174,10 @@
             .then(iconBlob => {
               icon.icon = iconBlob;
               return Promise.resolve();
-            }, Promise.reject);
+            }, Promise.reject.bind(Promise)); // XXXbz Why second arg?
         }
         return Promise.reject('No icon data found');
-      }, Promise.reject);
+      }, Promise.reject.bind(Promise));  // XXXbz Why bother with second arg?
   }
 
   function getBestIconFromWebManifest(webManifest, iconSize) {

diff --git a/shared/test/unit/mocks/mock_icons_helper.js b/shared/test/unit/mocks/mock_icons_helper.js
@@ -22,7 +22,7 @@ var MockIconsHelper = {
     });
   },
 
-  setElementIcon: Promise.resolve,
+  setElementIcon: Promise.resolve.bind(Promise),
 
   getBestIconFromWebManifest: function() {},
   getBestIconFromMetaTags: function() {},