fix(findAndCount): throws unhandled rejection from findAll (#8887)

lib/model.js

@@ -1895,25 +1895,18 @@ class Model {
     }
     }
 
 
     const countOptions = Utils.cloneDeep(options);
     const countOptions = Utils.cloneDeep(options);
+
     if (countOptions.attributes) {
     if (countOptions.attributes) {
       countOptions.attributes = undefined;
       countOptions.attributes = undefined;
     }
     }
 
 
-    const countQuery = this.count(countOptions);
-    const findQuery = this.findAll(options);
-
-    return countQuery.then(count => {
-      if (count === 0) {
-        return {
-          count: 0,
-          rows: []
-        };
-      }
-      return findQuery.then(results => ({
-        count: count || 0,
-        rows: results
-      }));
-    });
+    return Promise.all([
+      this.count(countOptions),
+      this.findAll(options)
+    ]).spread((count, rows) => ({
+      count,
+      rows: count === 0 ? [] : rows
+    }));
   }
   }
 
 
   /**
   /**

test/unit/model/find-and-count-all.test.js

+'use strict';
+
+const chai = require('chai'),
+  expect = chai.expect,
+  Support = require(__dirname + '/../support'),
+  current = Support.sequelize,
+  sinon = require('sinon'),
+  DataTypes = require(__dirname + '/../../../lib/data-types'),
+  Promise = require('bluebird').getNewLibraryCopy();
+
+describe(Support.getTestDialectTeaser('Model'), () => {
+  describe('findAndCount', () => {
+    describe('should handle promise rejection', () => {
+      before(function() {
+        this.stub = sinon.stub();
+
+        Promise.onPossiblyUnhandledRejection(() => {
+          this.stub();
+        });
+
+        this.User = current.define('User', {
+          username: DataTypes.STRING,
+          age: DataTypes.INTEGER
+        });
+
+        this.findAll = sinon.stub(this.User, 'findAll').callsFake(() => {
+          return Promise.reject(new Error());
+        });
+
+        this.count = sinon.stub(this.User, 'count').callsFake(() => {
+          return Promise.reject(new Error());
+        });
+      });
+
+      after(function() {
+        this.findAll.resetBehavior();
+        this.count.resetBehavior();
+      });
+
+      it('with errors in count and findAll both', function() {
+        return this.User.findAndCount({})
+          .then(() => {
+            throw new Error();
+          })
+          .catch(() => {
+            expect(this.stub.callCount).to.eql(0);
+          });
+      });
+    });
+  });
+});
\ No newline at end of file