Update tests

test/src/notebook/notebook/default-toolbar.spec.ts

@@ -243,20 +243,6 @@ describe('notebook/notebook/default-toolbar', () => {
 
     describe('#createInterruptButton()', () => {
 
-      it('should interrupt the kernel when clicked', (done) => {
-        let button = createInterruptButton(panel);
-        Widget.attach(button, document.body);
-        startKernel(panel.context).then(kernel => {
-          kernel.statusChanged.connect((sender, status) => {
-            if (status === 'idle') {
-              button.dispose();
-              done();
-            }
-          });
-          button.node.click();
-        }).catch(done);
-      });
-
       it('should have the `\'jp-Kernel-toolbarInterrupt\'` class', () => {
         let button = createInterruptButton(panel);
         expect(button.hasClass('jp-Kernel-toolbarInterrupt')).to.be(true);

test/src/notebook/notebook/panel.spec.ts

@@ -100,12 +100,14 @@ describe('notebook/notebook/panel', () => {
   });
 
   beforeEach(() => {
-    context = createNotebookContext();
+    context = createNotebookContext('', manager);
   });
 
-  after(() => {
-    context.kernel.shutdown();
+  afterEach(() => {
     context.dispose();
+  });
+
+  after(() => {
     manager.dispose();
   });
 
@@ -163,7 +165,9 @@ describe('notebook/notebook/panel', () => {
           expect(args.name).to.be.ok();
           done();
         });
-        panel.context.startDefaultKernel();
+        panel.context.save().then(() => {
+          return panel.context.startDefaultKernel();
+        }).catch(done);
       });
 
     });
@@ -190,7 +194,9 @@ describe('notebook/notebook/panel', () => {
 
       it('should be the current kernel used by the panel', (done) => {
         let panel = createPanel(context);
-        context.startDefaultKernel();
+        context.save().then(() => {
+          return context.startDefaultKernel();
+        }).catch(done);
         context.kernelChanged.connect(() => {
           expect(panel.kernel.name).to.be.ok();
           done();
@@ -329,10 +335,13 @@ describe('notebook/notebook/panel', () => {
       it('should be called when the path changes', (done) => {
         let panel = createPanel(context);
         panel.methods = [];
-        manager.contents.rename(context.path, 'foo').then(() => {
+        context.save().then(() => {
+          return manager.contents.rename(context.path, 'foo.ipynb');
+        }).catch(done);
+        context.pathChanged.connect(() => {
           expect(panel.methods).to.contain('onPathChanged');
           done();
-        }).catch(done);
+        });
       });
 
       it('should be called when the context changes', () => {

test/src/utils.ts

@@ -54,8 +54,8 @@ function defaultRenderMime(): RenderMime {
  * Create a context for a file.
  */
 export
-function createFileContext(path?: string): Context<DocumentRegistry.IModel> {
-  let manager = Private.manager;
+function createFileContext(path?: string, manager?: ServiceManager.IManager): Context<DocumentRegistry.IModel> {
+  manager = manager || Private.manager;
   let factory = Private.textFactory;
   path = path || utils.uuid() + '.txt';
   return new Context({ manager, factory, path });
@@ -66,8 +66,8 @@ function createFileContext(path?: string): Context<DocumentRegistry.IModel> {
  * Create a context for a notebook.
  */
 export
-function createNotebookContext(path?: string): Context<INotebookModel> {
-  let manager = Private.manager;
+function createNotebookContext(path?: string, manager?: ServiceManager.IManager): Context<INotebookModel> {
+  manager = manager || Private.manager;
   let factory = Private.notebookFactory;
   path = path || utils.uuid() + '.ipynb';
   return new Context({ manager, factory, path });
@@ -100,9 +100,6 @@ export
 function acceptDialog(host: HTMLElement = document.body): Promise<void> {
   return waitForDialog(host).then(() => {
     let node = host.getElementsByClassName('jp-Dialog-okButton')[0];
-    if (!node) {
-      node = host.getElementsByClassName('jp-Dialog-warningButton')[0];
-    }
     if (node) {
       (node as HTMLElement).click();
     }