Browse Source

Clean up restart test

Steven Silvester 8 years ago
parent
commit
00d47b4362
2 changed files with 8 additions and 12 deletions
  1. 8 10
      test/src/notebook/notebook/default-toolbar.spec.ts
  2. 0 2
      test/src/utils.ts

+ 8 - 10
test/src/notebook/notebook/default-toolbar.spec.ts

@@ -221,17 +221,15 @@ describe('notebook/notebook/default-toolbar', () => {
         let button = ToolbarItems.createRestartButton(panel);
         panel.attach(document.body);
         button.attach(document.body);
-        button.node.click();
-        console.log('***1');
-        acceptDialog(panel.node).then(() => {
-          console.log('**4', context.kernel.status);
-          expect(context.kernel.status).to.be('restarting');
-          console.log('**5');
-          panel.dispose();
-          console.log('**6');
-          button.dispose();
-          done();
+        panel.kernel.statusChanged.connect((sender, status) => {
+          if (status === 'restarting') {
+            panel.dispose();
+            button.dispose();
+            done();
+          }
         });
+        button.node.click();
+        acceptDialog(panel.node);
       });
 
       it("should have the `'jp-NBToolbar-restart'` class", () => {

+ 0 - 2
test/src/utils.ts

@@ -31,10 +31,8 @@ function waitForDialog(host: HTMLElement = document.body): Promise<void> {
 export
 function acceptDialog(host: HTMLElement = document.body): Promise<void> {
   return waitForDialog(host).then(() => {
-    console.log('***2');
     let node = host.getElementsByClassName('jp-Dialog-okButton')[0];
     if (node) {
-      console.log('***3');
       (node as HTMLElement).click();
     }
   });