use same doneCalled trick for the other treatment api tests and a ;

nightscout · Jan 6, 2016 · 71f7854 · 71f7854
1 parent e22c9bf
commit 71f7854
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/treatments.js b/lib/treatments.js
@@ -30,7 +30,7 @@ function storage (env, ctx) {
       });
     } else {
       upsert(objOrArray, function upserted (err, docs) {
-        done(err, docs)
+        done(err, docs);
       });
     }
 

diff --git a/tests/api.treatments.test.js b/tests/api.treatments.test.js
@@ -46,7 +46,6 @@ describe('Treatment API', function ( ) {
       if (!doneCalled) { done(); }
 
       doneCalled = true;
-
     });
 
     self.ctx.treatments().remove({ }, function ( ) {
@@ -76,6 +75,7 @@ describe('Treatment API', function ( ) {
   });
 
   it('post a treatment array', function (done) {
+    var doneCalled = false;
 
     self.ctx.bus.on('data-loaded', function dataWasLoaded ( ) {
       self.ctx.ddata.treatments.length.should.equal(3);
@@ -90,7 +90,10 @@ describe('Treatment API', function ( ) {
       self.ctx.ddata.treatments[1].insulin.should.equal(2);
       self.ctx.ddata.treatments[2].carbs.should.equal(30);
 
-      done();
+      //if travis is slow the 2 posts take long enough that 2 data-loaded events are emitted
+      if (!doneCalled) { done(); }
+
+      doneCalled = true;
     });
 
     self.ctx.treatments().remove({ }, function ( ) {
@@ -111,11 +114,16 @@ describe('Treatment API', function ( ) {
   });
 
   it('post a treatment array and dedupe', function (done) {
+    var doneCalled = false;
 
     self.ctx.bus.on('data-loaded', function dataWasLoaded ( ) {
       self.ctx.ddata.treatments.length.should.equal(3);
       self.ctx.ddata.treatments[0].mgdl.should.equal(100);
-      done();
+
+      //if travis is slow the 2 posts take long enough that 2 data-loaded events are emitted
+      if (!doneCalled) { done(); }
+
+      doneCalled = true;
     });
 
     self.ctx.treatments().remove({ }, function ( ) {