Steven Silvester пре 8 година
родитељ
комит
17d85b6f12

+ 5 - 5
packages/services/test/src/kernel/kernel.spec.ts

@@ -502,21 +502,21 @@ describe('kernel', () => {
 
     context('#info', () => {
 
-      it('should get the kernel info', (done) => {
+      it('should get the kernel info', () => {
         return kernel.ready.then(() => {
           let name = kernel.info.language_info.name;
           expect(name).to.be(EXAMPLE_KERNEL_INFO.language_info.name);
-        }).then(done, done);
+        });
       });
 
     });
 
     context('#getSpec()', () => {
 
-      it('should resolve with the spec', (done) => {
+      it('should resolve with the spec', () => {
         return kernel.getSpec().then(spec => {
           expect(spec.language).to.be('python');
-        }).then(done, done);
+        });
       });
 
     });
@@ -540,7 +540,7 @@ describe('kernel', () => {
     context('#ready', () => {
 
       it('should resolve when the kernel is ready', (done) => {
-        return kernel.ready.then(done, done);
+        return kernel.ready;
       });
 
     });

+ 4 - 4
packages/services/test/src/kernel/manager.spec.ts

@@ -245,14 +245,14 @@ describe('kernel/manager', () => {
 
     describe('#connectTo()', () => {
 
-      it('should connect to an existing kernel', (done) => {
+      it('should connect to an existing kernel', () => {
         let id = uuid();
         tester.runningKernels = [{ name: 'foo', id }];
         return manager.connectTo(id).then(kernel => {
           expect(kernel.name).to.be('foo');
           expect(kernel.id).to.be(id);
           return kernel.shutdown();
-        }).then(done, done);
+        });
       });
 
       it('should emit a runningChanged signal', (done) => {
@@ -268,8 +268,8 @@ describe('kernel/manager', () => {
 
     describe('shutdown()', () => {
 
-      it('should shut down a kernel by id', (done) => {
-        manager.shutdown('foo').then(done, done);
+      it('should shut down a kernel by id', () => {
+        return manager.shutdown('foo');
       });
 
       it('should emit a runningChanged signal', (done) => {

+ 5 - 6
packages/services/test/src/terminal/manager.spec.ts

@@ -26,19 +26,18 @@ describe('terminals', () => {
   let manager: TerminalSession.IManager;
   let data: TerminalSession.IModel[] =  [{ name: 'foo'}, { name: 'bar' }];
 
-  beforeEach((done) => {
+  beforeEach(() => {
     tester = new TerminalTester();
     tester.runningTerminals = data;
     manager = new TerminalManager();
-    return manager.ready.then(done, done);
+    return manager.ready;
   });
 
-  afterEach((done) => {
-    manager.ready.then(() => {
+  afterEach(() => {
+    return manager.ready.then(() => {
       manager.dispose();
       tester.dispose();
-      done();
-    }).catch(done);
+    });
   });
 
   describe('TerminalManager', () => {

+ 2 - 3
packages/services/test/src/terminal/terminal.spec.ts

@@ -133,10 +133,9 @@ describe('terminals', () => {
 
   describe('.ISession', () => {
 
-    beforeEach((done) => {
-      TerminalSession.startNew().then(s => {
+    beforeEach(() => {
+      return TerminalSession.startNew().then(s => {
         session = s;
-        done();
       });
     });