Move to npm for several dependencies

mustache
jQuery
underscore
backbone
mocha
chai
intl-tel-input

test/views/conversation_search_view_test.js

@@ -31,8 +31,8 @@ describe('ConversationSearchView', function() {
       type: 'group',
       left: true,
     });
-    before(function(done) {
-      convo.save().then(done);
+    before(() => {
+      return wrapDeferred(convo.save());
     });
     describe('with no messages', function() {
       var input = $('<input>');
@@ -82,13 +82,13 @@ describe('ConversationSearchView', function() {
       type: 'group',
       left: true,
     });
-    before(function(done) {
-      convo.save().then(done);
+    before(() => {
+      return wrapDeferred(convo.save());
     });
     describe('with no messages', function() {
       before(function(done) {
         view.resetTypeahead();
-        view.typeahead_view.collection.on('reset', function() {
+        view.typeahead_view.collection.once('reset', function() {
           done();
         });
       });
@@ -100,12 +100,12 @@ describe('ConversationSearchView', function() {
       });
     });
     describe('with messages', function() {
-      before(function(done) {
-        convo.save({ lastMessage: 'asdf' }).then(function() {
-          view.typeahead_view.collection.on('reset', function() {
+      before(done => {
+        wrapDeferred(convo.save({ lastMessage: 'asdf' })).then(function() {
+          view.resetTypeahead();
+          view.typeahead_view.collection.once('reset', function() {
             done();
           });
-          view.resetTypeahead();
         });
       });
       it('should surface left groups with messages', function() {

test/views/message_view_test.js

@@ -1,7 +1,7 @@
 describe('MessageView', function() {
   var convo, message;
 
-  before(async done => {
+  before(async () => {
     await clearDatabase();
     convo = new Whisper.Conversation({ id: 'foo' });
     message = convo.messageCollection.add({
@@ -13,7 +13,6 @@ describe('MessageView', function() {
     });
 
     await storage.put('number_id', '+18088888888.1');
-    done();
   });
 
   it('should display the message text', function() {