cleanup

package.json

@@ -9,7 +9,8 @@
     "build:examples": "lerna run build --scope \"@jupyterlab/example-*\"",
     "build:packages": "cd packages/metapackage && jlpm run build",
     "build:src": "lerna run build --scope \"@jupyterlab/!(test-|example-)*\"",
-    "build:test": "lerna run build:test",
+    "build:test": "jlpm run build:testutils && lerna run build:test",
+    "build:testutils": "cd testutils && jlpm run build",
     "build:themes": "lerna run build:webpack --scope \"@jupyterlab/theme-*-extension\"",
     "build:update": "node buildutils/lib/update-core-mode.js",
     "build:utils": "cd buildutils && jlpm run build",

tests/test-application/src/router.spec.ts

@@ -9,6 +9,8 @@ import { CommandRegistry } from '@phosphor/commands';
 
 import { Token } from '@phosphor/coreutils';
 
+import { testEmission } from '@jupyterlab/testutils';
+
 const base = '/';
 
 describe('apputils', () => {
@@ -69,7 +71,7 @@ describe('apputils', () => {
           called = true;
         });
         await router.route();
-        expect(called).to.be(true);
+        expect(called).to.equal(true);
       });
     });
 
@@ -104,13 +106,13 @@ describe('apputils', () => {
         router.register({ command: 'c', pattern: /.*/, rank: 30 });
         router.register({ command: 'd', pattern: /.*/, rank: 40 });
 
-        let called = false;
-        router.routed.connect(() => {
-          expect(recorded).to.deep.equal(wanted);
-          called = true;
+        let promise = testEmission(router.routed, {
+          test: () => {
+            expect(recorded).to.deep.equal(wanted);
+          }
         });
         await router.route();
-        expect(called).to.be(true);
+        await promise;
       });
     });
 
@@ -139,7 +141,7 @@ describe('apputils', () => {
           called = true;
         });
         await router.route();
-        expect(called).to.be(true);
+        expect(called).to.equal(true);
       });
     });
 
@@ -166,7 +168,7 @@ describe('apputils', () => {
           called = true;
         });
         await router.route();
-        expect(called).to.be(true);
+        expect(called).to.equal(true);
       });
     });
   });

testutils/src/notebook-utils.ts

@@ -23,7 +23,7 @@ import { RenderMimeRegistry } from '@jupyterlab/rendermime';
 
 import { Cell, CodeCellModel } from '@jupyterlab/cells';
 
-import { defaultRenderMime } from './rendermime';
+import { defaultRenderMime as localRendermime } from './rendermime';
 
 /**
  * Stub for the require() function.
@@ -89,7 +89,7 @@ export namespace NBTestUtils {
    * Get a copy of the default rendermime instance.
    */
   export function defaultRenderMime(): RenderMimeRegistry {
-    return defaultRenderMime();
+    return localRendermime();
   }
 
   export const clipboard = Clipboard.getInstance();