Use chai-as-promised to simplify async tests

package.json

@@ -21,7 +21,8 @@
     "rewire": "^2.0.1",
     "sinon": "^1.10.1",
     "sinon-chai": "^2.5.0",
-    "dropbox-mock": "0.0.1"
+    "dropbox-mock": "0.0.1",
+    "chai-as-promised": "^4.1.1"
   },
   "dependencies": {
     "q": "^1.0.1"

src/test/js/DropboxServiceSpec.js

@@ -11,16 +11,18 @@ describe('DropboxService', function() {
     });
 
     it('only opens the datastore once', function() {
-      DropboxService.insert('MyTable', { data: true}).then(function() {
+      return DropboxService.insert('MyTable', { data: true})
+      .then(function() {
         DropboxService.insert('MyTable', { data: true});
-      }).done();
+      });
     });
   });
 
   describe('query', function() {
-    it('retrieves records', function(done) {
+    it('retrieves records', function() {
       Dropbox['MyTable'] = [ {name: 'A'}, {name: 'B'} ];
-      check(DropboxService.query('MyTable'), done, [ {name: 'A'}, {name: 'B'} ]);
+      return expect(DropboxService.query('MyTable'))
+        .to.eventually.eql([ {name: 'A'}, {name: 'B'} ]);
     });
   });
 });

src/test/js/ProjectServiceSpec.js

@@ -19,9 +19,10 @@ describe('ProjectService', function() {
   });
 
   describe('getAll', function() {
-    it('returns all projects', function(done) {
+    it('returns all projects', function() {
       projectsDefer.resolve(['A', 'B']);
-      check(ProjectService.getAll(), done, ['A', 'B']);
+      return expect(ProjectService.getAll())
+        .to.eventually.eql(['A', 'B']);
     });
   });
 });

src/test/js/env.js

@@ -1,20 +1,11 @@
 global.rewire = require('rewire');
 global.sinon = require('sinon');
+global.Q = require('q');
+
 global.chai = require('chai');
 global.chai.use(require('sinon-chai'));
+global.chai.use(require("chai-as-promised"));
 global.expect = chai.expect;
-global.Q = require('q');
 
 global.Dropbox = new (require('dropbox-mock'))();
 global.Dropbox.allowAppKey('hzy00wu1zd7neiv');
-
-global.check = function(promise, done, expected) {
-  promise.then(function(actual) {
-    try {
-      expect(actual).to.eql(expected);
-      done();
-    } catch (e) {
-      done(e);
-    }
-  });
-}