Browse Source

fixed unittests to deal with icon namespacing

telamonian 5 years ago
parent
commit
77ae24eab4

+ 1 - 1
packages/shortcuts-extension/schema/shortcuts.json

@@ -1,5 +1,5 @@
 {
-  "jupyter.lab.setting-icon-class": "jp-KeyboardIcon",
+  "jupyter.lab.setting-icon-class": "ui-components:keyboard",
   "jupyter.lab.setting-icon-label": "Keyboard Shortcuts",
   "jupyter.lab.transform": true,
   "title": "Keyboard Shortcuts",

+ 4 - 4
tests/test-apputils/src/toolbar.spec.ts

@@ -289,7 +289,7 @@ describe('@jupyterlab/apputils', () => {
           const button = Toolbar.createInterruptButton(sessionContext);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='stop']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='stop']")).to.exist;
         });
       });
 
@@ -298,7 +298,7 @@ describe('@jupyterlab/apputils', () => {
           const button = Toolbar.createRestartButton(sessionContext);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='refresh']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='refresh']")).to.exist;
         });
       });
 
@@ -326,7 +326,7 @@ describe('@jupyterlab/apputils', () => {
           let called = false;
           sessionContext.statusChanged.connect((_, status) => {
             if (status === 'busy') {
-              expect(item.node.querySelector("[data-icon='circle']")).to.exist;
+              expect(item.node.querySelector("[data-icon$='circle']")).to.exist;
               called = true;
             }
           });
@@ -362,7 +362,7 @@ describe('@jupyterlab/apputils', () => {
           await sessionContext.initialize();
           const item = Toolbar.createKernelStatusItem(sessionContext);
           expect(item.node.title).to.equal('Kernel Connecting');
-          expect(item.node.querySelector("[data-icon='circle-empty']")).to
+          expect(item.node.querySelector("[data-icon$='circle-empty']")).to
             .exist;
           await sessionContext.initialize();
           await sessionContext.session?.kernel?.info;

+ 4 - 6
tests/test-codeeditor/src/jsoneditor.spec.ts

@@ -87,17 +87,15 @@ describe('codeeditor', () => {
 
     describe('#revertButtonNode', () => {
       it('should be the revert button node used by the editor', () => {
-        expect(editor.revertButtonNode.firstElementChild!.localName).to.equal(
-          'svg'
-        );
+        expect(editor.revertButtonNode.querySelector("[data-icon$='undo']")).to
+          .exist;
       });
     });
 
     describe('#commitButtonNode', () => {
       it('should be the commit button node used by the editor', () => {
-        expect(editor.commitButtonNode.firstElementChild!.localName).to.equal(
-          'svg'
-        );
+        expect(editor.commitButtonNode.querySelector("[data-icon$='check']")).to
+          .exist;
       });
     });
 

+ 6 - 6
tests/test-notebook/src/default-toolbar.spec.ts

@@ -62,7 +62,7 @@ describe('@jupyterlab/notebook', () => {
           const button = ToolbarItems.createSaveButton(panel);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='save']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='save']")).to.exist;
         });
       });
 
@@ -81,7 +81,7 @@ describe('@jupyterlab/notebook', () => {
           const button = ToolbarItems.createInsertButton(panel);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='add']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='add']")).to.exist;
           button.dispose();
         });
       });
@@ -104,7 +104,7 @@ describe('@jupyterlab/notebook', () => {
           const button = ToolbarItems.createCutButton(panel);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='cut']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='cut']")).to.exist;
           button.dispose();
         });
       });
@@ -127,7 +127,7 @@ describe('@jupyterlab/notebook', () => {
           const button = ToolbarItems.createCopyButton(panel);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='copy']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='copy']")).to.exist;
           button.dispose();
         });
       });
@@ -149,7 +149,7 @@ describe('@jupyterlab/notebook', () => {
           const button = ToolbarItems.createPasteButton(panel);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='paste']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='paste']")).to.exist;
           button.dispose();
         });
       });
@@ -276,7 +276,7 @@ describe('@jupyterlab/notebook', () => {
           const button = ToolbarItems.createRunButton(panel);
           Widget.attach(button, document.body);
           await framePromise();
-          expect(button.node.querySelector("[data-icon='run']")).to.exist;
+          expect(button.node.querySelector("[data-icon$='run']")).to.exist;
         });
       });
     });