fixed @jupyterlab/test-filebrowser

tests/test-filebrowser/src/crumbs.spec.ts

@@ -7,18 +7,20 @@ import { DocumentManager, IDocumentManager } from '@jupyterlab/docmanager';
 
 import { DocumentRegistry, TextModelFactory } from '@jupyterlab/docregistry';
 
+import { BreadCrumbs, FileBrowserModel } from '@jupyterlab/filebrowser';
+
 import { ServiceManager } from '@jupyterlab/services';
 
+import { framePromise, signalToPromise } from '@jupyterlab/testutils';
+
+import { defaultIconRegistry, IIconRegistry } from '@jupyterlab/ui-components';
+
 import { Message, MessageLoop } from '@phosphor/messaging';
 
 import { Widget } from '@phosphor/widgets';
 
 import { simulate } from 'simulate-event';
 
-import { BreadCrumbs, FileBrowserModel } from '@jupyterlab/filebrowser';
-
-import { framePromise, signalToPromise } from '@jupyterlab/testutils';
-
 const ITEM_CLASS = 'jp-BreadCrumbs-item';
 
 class LogCrumbs extends BreadCrumbs {
@@ -47,6 +49,7 @@ class LogCrumbs extends BreadCrumbs {
 }
 
 describe('filebrowser/model', () => {
+  let iconRegistry: IIconRegistry;
   let manager: IDocumentManager;
   let serviceManager: ServiceManager.IManager;
   let registry: DocumentRegistry;
@@ -68,6 +71,7 @@ describe('filebrowser/model', () => {
       textModelFactory: new TextModelFactory()
     });
     serviceManager = new ServiceManager({ standby: 'never' });
+    iconRegistry = defaultIconRegistry;
     manager = new DocumentManager({
       registry,
       opener,
@@ -91,7 +95,7 @@ describe('filebrowser/model', () => {
   });
 
   beforeEach(async () => {
-    model = new FileBrowserModel({ manager });
+    model = new FileBrowserModel({ iconRegistry, manager });
     await model.cd(path);
     crumbs = new LogCrumbs({ model });
   });
@@ -198,7 +202,7 @@ describe('filebrowser/model', () => {
 
     describe('#onUpdateRequest()', () => {
       it('should be called when the model updates', async () => {
-        const model = new FileBrowserModel({ manager });
+        const model = new FileBrowserModel({ iconRegistry, manager });
         await model.cd(path);
         crumbs = new LogCrumbs({ model });
         await model.cd('..');

tests/test-filebrowser/src/model.spec.ts

@@ -11,24 +11,27 @@ import { DocumentManager, IDocumentManager } from '@jupyterlab/docmanager';
 
 import { DocumentRegistry, TextModelFactory } from '@jupyterlab/docregistry';
 
-import {
-  Contents,
-  ContentsManager,
-  ServiceManager
-} from '@jupyterlab/services';
-
 import {
   FileBrowserModel,
   LARGE_FILE_SIZE,
   CHUNK_SIZE
 } from '@jupyterlab/filebrowser';
 
+import {
+  Contents,
+  ContentsManager,
+  ServiceManager
+} from '@jupyterlab/services';
+
 import {
   acceptDialog,
   dismissDialog,
   signalToPromises,
   sleep
 } from '@jupyterlab/testutils';
+
+import { defaultIconRegistry, IIconRegistry } from '@jupyterlab/ui-components';
+
 import { toArray } from '@phosphor/algorithm';
 
 /**
@@ -55,6 +58,7 @@ class DelayedContentsManager extends ContentsManager {
 }
 
 describe('filebrowser/model', () => {
+  let iconRegistry: IIconRegistry;
   let manager: IDocumentManager;
   let serviceManager: ServiceManager.IManager;
   let registry: DocumentRegistry;
@@ -73,6 +77,7 @@ describe('filebrowser/model', () => {
       textModelFactory: new TextModelFactory()
     });
     serviceManager = new ServiceManager({ standby: 'never' });
+    iconRegistry = defaultIconRegistry;
     manager = new DocumentManager({
       registry,
       opener,
@@ -83,7 +88,7 @@ describe('filebrowser/model', () => {
 
   beforeEach(async () => {
     await state.clear();
-    model = new FileBrowserModel({ manager, state });
+    model = new FileBrowserModel({ iconRegistry, manager, state });
     const contents = await manager.newUntitled({ type: 'file' });
     name = contents.name;
     return model.cd();
@@ -96,7 +101,7 @@ describe('filebrowser/model', () => {
   describe('FileBrowserModel', () => {
     describe('#constructor()', () => {
       it('should construct a new file browser model', () => {
-        model = new FileBrowserModel({ manager });
+        model = new FileBrowserModel({ iconRegistry, manager });
         expect(model).to.be.an.instanceof(FileBrowserModel);
       });
     });
@@ -260,7 +265,7 @@ describe('filebrowser/model', () => {
           opener,
           manager: delayedServiceManager
         });
-        model = new FileBrowserModel({ manager, state }); // Should delay 1000ms
+        model = new FileBrowserModel({ iconRegistry, manager, state }); // Should delay 1000ms
 
         // An initial refresh is called in the constructor.
         // If it is too slow, it can come in after the directory change,
@@ -280,7 +285,7 @@ describe('filebrowser/model', () => {
     describe('#restore()', () => {
       it('should restore based on ID', async () => {
         const id = 'foo';
-        const model2 = new FileBrowserModel({ manager, state });
+        const model2 = new FileBrowserModel({ iconRegistry, manager, state });
         await model.restore(id);
         await model.cd('src');
         expect(model.path).to.equal('src');
@@ -292,7 +297,7 @@ describe('filebrowser/model', () => {
 
       it('should be safe to call multiple times', async () => {
         const id = 'bar';
-        const model2 = new FileBrowserModel({ manager, state });
+        const model2 = new FileBrowserModel({ iconRegistry, manager, state });
         await model.restore(id);
         await model.cd('src');
         expect(model.path).to.equal('src');

tests/test-filebrowser/tsconfig.json

@@ -25,6 +25,9 @@
     },
     {
       "path": "../../testutils"
+    },
+    {
+      "path": "../../packages/ui-components"
     }
   ]
 }