Merge pull request #1928 from blink1073/update-deps

Update karma and mocha deps

package.json

@@ -54,16 +54,16 @@
     "istanbul-instrumenter-loader": "^0.1.3",
     "json-loader": "^0.5.4",
     "json-to-html": "^0.1.2",
-    "karma": "^0.13.19",
-    "karma-chrome-launcher": "^0.2.2",
-    "karma-coverage": "^0.5.3",
-    "karma-firefox-launcher": "^0.1.7",
-    "karma-ie-launcher": "^0.2.0",
-    "karma-mocha": "^0.2.1",
-    "karma-mocha-reporter": "^1.1.5",
-    "karma-remap-coverage": "^0.1.1",
+    "karma": "^1.5.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-coverage": "^1.1.1",
+    "karma-firefox-launcher": "^1.0.1",
+    "karma-ie-launcher": "^1.0.0",
+    "karma-mocha": "^1.3.0",
+    "karma-mocha-reporter": "^2.2.2",
+    "karma-remap-coverage": "^0.1.4",
     "karma-sourcemap-loader": "^0.3.7",
-    "mocha": "^2.3.4",
+    "mocha": "^3.2.0",
     "raw-loader": "^0.5.1",
     "rimraf": "^2.5.0",
     "simulate-event": "^1.2.0",

test/src/apputils/toolbar.spec.ts

@@ -224,31 +224,43 @@ describe('@jupyterlab/apputils', () => {
       describe('.createKernelStatusItem()', () => {
 
         beforeEach(() => {
-          return owner.startKernel();
+          return owner.startKernel().then(kernel => {
+            return owner.kernel.ready;
+          });
         });
 
         it('should display a busy status if the kernel status is not idle', (done) => {
           let item = Toolbar.createKernelStatusItem(owner);
-          owner.kernel.statusChanged.connect(() => {
+          let called = false;
+          let future = owner.kernel.requestExecute({ code: 'a = 1' });
+          future.onIOPub = msg => {
             if (owner.kernel.status === 'busy') {
               expect(item.hasClass('jp-mod-busy')).to.be(true);
-              done();
+              called = true;
             }
-          });
-          owner.kernel.requestExecute({ code: 'a = 1' });
+          };
+          future.onDone = () => {
+            expect(called).to.be(true);
+            done();
+          };
         });
 
         it('should show the current status in the node title', (done) => {
           let item = Toolbar.createKernelStatusItem(owner);
           let status = owner.kernel.status;
           expect(item.node.title.toLowerCase()).to.contain(status);
-          owner.kernel.statusChanged.connect(() => {
+          let called = false;
+          let future = owner.kernel.requestExecute({ code: 'a = 1' });
+          future.onIOPub = msg => {
             if (owner.kernel.status === 'busy') {
               expect(item.node.title.toLowerCase()).to.contain('busy');
-              done();
+              called = true;
             }
-          });
-          owner.kernel.requestExecute({ code: 'a = 1' });
+          };
+          future.onDone = () => {
+            expect(called).to.be(true);
+            done();
+          };
         });
 
         it('should handle a null kernel', () => {

test/src/completer/handler.spec.ts

@@ -86,7 +86,7 @@ describe('completer/handler', () => {
   });
 
   after(() => {
-    kernel.shutdown();
+    return kernel.shutdown();
   });
 
   describe('CompletionHandler', () => {

test/src/filebrowser/model.spec.ts

@@ -26,12 +26,12 @@ describe('filebrowser/model', () => {
     manager = new ServiceManager();
   });
 
-  beforeEach((done) => {
+  beforeEach(() => {
     model = new FileBrowserModel({ manager });
-    model.newUntitled({ type: 'file' }).then(contents => {
+    return model.newUntitled({ type: 'file' }).then(contents => {
       name = contents.name;
       return model.cd();
-    }).then(done, done);
+    });
   });
 
   afterEach(() => {
@@ -365,11 +365,11 @@ describe('filebrowser/model', () => {
 
     describe('#shutdown()', () => {
 
-      it('should shut down a session by session id', (done) => {
+      it('should shut down a session by session id', () => {
         let length = 0;
         let sessions = manager.sessions;
         length = toArray(sessions.running()).length;
-        model.newUntitled({ type: 'notebook' }).then(contents => {
+        return model.newUntitled({ type: 'notebook' }).then(contents => {
           return sessions.startNew({ path: contents.path });
         }).then(session => {
           session.dispose();
@@ -378,8 +378,7 @@ describe('filebrowser/model', () => {
           return sessions.refreshRunning();
         }).then(() => {
           expect(toArray(sessions.running()).length).to.be(length);
-          done();
-        }).catch(done);
+        });
       });
 
     });

test/src/imagewidget/widget.spec.ts

@@ -72,19 +72,17 @@ describe('ImageWidget', () => {
   let manager: ServiceManager.IManager;
   let widget: LogImage;
 
-  before((done) => {
+  before(() => {
     manager = new ServiceManager();
-    manager.ready.then(() => {
+    return manager.ready.then(() => {
       return manager.contents.save(IMAGE.path, IMAGE);
-    }).then(() => {
-      done();
-    }).catch(done);
+    });
   });
 
-  beforeEach((done) => {
+  beforeEach(() => {
     context = new Context({ manager, factory, path: IMAGE.path });
     widget = new LogImage(context);
-    return context.revert().then(done, done);
+    return context.revert();
   });
 
   afterEach(() => {
@@ -104,7 +102,7 @@ describe('ImageWidget', () => {
         expect(widget.title.label).to.be(newPath);
         done();
       });
-      return manager.contents.rename(context.path, newPath).catch(done);
+      manager.contents.rename(context.path, newPath).catch(done);
     });
 
     it('should set the content after the context is ready', (done) => {

test/src/outputarea/widget.spec.ts

@@ -173,13 +173,11 @@ describe('outputarea/widget', () => {
 
       let kernel: Kernel.IKernel;
 
-      beforeEach((done) => {
-        Kernel.startNew().then(k => {
+      beforeEach(() => {
+        return Kernel.startNew().then(k => {
           kernel = k;
           return kernel.ready;
-        }).then(() => {
-          done();
-        }).catch(done);
+        });
       });
 
       it('should execute code on a kernel and send outputs to the model', () => {
@@ -259,8 +257,8 @@ describe('outputarea/widget', () => {
 
       describe('#createStdin()', () => {
 
-        it('should create a stdin widget', (done) => {
-          Kernel.startNew().then(kernel => {
+        it('should create a stdin widget', () => {
+          return Kernel.startNew().then(kernel => {
             let factory = new OutputAreaWidget.ContentFactory();
             let options = {
               prompt: 'hello',
@@ -269,7 +267,7 @@ describe('outputarea/widget', () => {
             };
             expect(factory.createStdin(options)).to.be.a(Widget);
             kernel.dispose();
-          }).then(done, done);
+          });
         });
 
       });