clean up assertions in beforeCount test code

test/integration/hooks.test.js

@@ -990,52 +990,6 @@ describe(Support.getTestDialectTeaser('Hooks'), function() {
     describe('on success', function() {
     describe('on success', function() {
       it('hook runs', function() {
       it('hook runs', function() {
         var beforeHook = false;
         var beforeHook = false;
-        this.User.beforeCount(function() {
-          beforeHook = true;
-        });
-
-        return this.User.count().then(function(count) {
-          expect(count).to.equal(3);
-          expect(beforeHook).to.be.true;
-        });
-      });
-
-      it('beforeCount hook can change options', function() {
-        this.User.beforeCount(function(options) {
-          options.where.username = 'adam';
-        });
-
-        return this.User.count({where: {username: 'joe'}}).then(function(count) {
-          expect(count).to.equal(1);
-        });
-      });
-    });
-
-    describe('on error', function() {
-      it('in beforeCount hook returns error', function() {
-        this.User.beforeCount(function() {
-          throw new Error('Oops!');
-        });
-
-        return this.User.find({where: {username: 'adam'}}).catch (function(err) {
-          expect(err.message).to.equal('Oops!');
-        });
-      });
-    });
-  });
-
-  describe('#count', function() {
-    beforeEach(function() {
-      return this.User.bulkCreate([
-        {username: 'adam', mood: 'happy'},
-        {username: 'joe', mood: 'sad'},
-        {username: 'joe', mood: 'happy'}
-      ]);
-    });
-
-    describe('on success', function() {
-      it('hook runs', function() {
-        var beforeHook = false;
 
 
         this.User.beforeCount(function() {
         this.User.beforeCount(function() {
           beforeHook = true;
           beforeHook = true;
@@ -1052,9 +1006,7 @@ describe(Support.getTestDialectTeaser('Hooks'), function() {
           options.where.username = 'adam';
           options.where.username = 'adam';
         });
         });
 
 
-        return this.User.count({where: {username: 'joe'}}).then(function(count) {
-          expect(count).to.equal(1);
-        });
+        return expect(this.User.count({where: {username: 'joe'}})).to.eventually.equal(1);
       });
       });
     });
     });
 
 
@@ -1064,9 +1016,7 @@ describe(Support.getTestDialectTeaser('Hooks'), function() {
           throw new Error('Oops!');
           throw new Error('Oops!');
         });
         });
 
 
-        return this.User.find({where: {username: 'adam'}}).catch (function(err) {
-          expect(err.message).to.equal('Oops!');
-        });
+        return expect(this.User.count({where: {username: 'adam'}})).to.be.rejectedWith('Oops!');
       });
       });
     });
     });
   });
   });