Merge branch 'release-v1.2.6' into develop

ludovic-gonthier · May 23, 2016 · 8a25a7d · 8a25a7d
2 parents bfaf8f3 + 75eb7e7
commit 8a25a7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "snowshoe",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "GitHub dashboard to keep tracks on your ongoing PR",
   "author": {
     "name": "Ludovic Gonthier",

diff --git a/tests/common/github/fetcher.js b/tests/common/github/fetcher.js
@@ -61,27 +61,22 @@ describe('fetcher', () => {
           .catch(reject);
       });
     });
-    it('should resolve the promise with empty array on error', () => {
+    it('should reject the promise on error', () => {
       stubs.url_formatter
         .withArgs('/user/orgs', { per_page: 100 })
         .returns('https://api.github.com/user/orgs?per_page=100');
       stubs.request.paginate
         .withArgs('https://api.github.com/user/orgs?per_page=100', 'organization')
         .returns(Promise.reject(new Error('Pagination error')));
-      console.error = sinon.stub(); // eslint-disable-line no-console
 
       requestStub
         .withArgs('test_token')
         .returns(stubs.request);
 
       return new Promise((resolve, reject) => {
         organizations('test_token')
-          .then(data => {
-            expect(console.error).to.have.been.called; // eslint-disable-line no-console
-            expect(data).to.eql([]);
-            resolve();
-          })
-          .catch(reject);
+          .then(() => reject(new Error('Promise should have been rejected')))
+          .catch(resolve);
       });
     });
   });
@@ -117,20 +112,16 @@ describe('fetcher', () => {
       stubs.request.paginate
         .withArgs('https://api.github.com/orgs/snowshoe/teams?per_page=100', 'team')
         .returns(Promise.reject(new Error('Pagination error')));
-      console.error = sinon.stub(); // eslint-disable-line no-console
 
       requestStub
         .withArgs('test_token')
         .returns(stubs.request);
 
       return new Promise((resolve, reject) => {
         teams('test_token', 'snowshoe')
-          .then(data => {
-            expect(console.error).to.have.been.called; // eslint-disable-line no-console
-            expect(data).to.eql([]);
-            resolve();
-          })
-          .catch(reject);
+          .then(() => reject(new Error('Promise should have been rejected')))
+          .catch(resolve);
+
       });
     });
   });