Skip to content

Commit

Permalink
Support JupyterLab 0.35 (#12)
Browse files Browse the repository at this point in the history
* bump to 0.35

* rebuild yarn.lock

* fix tests for robot 3.1
  • Loading branch information
bollwyvl authored Jan 4, 2019
1 parent 5a9db97 commit 41c7cd8
Show file tree
Hide file tree
Showing 9 changed files with 760 additions and 642 deletions.
7 changes: 3 additions & 4 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@ dependencies:
- flake8
- fonttools
- geckodriver
- jupyterlab >=0.34,<0.35
- jupyterlab >=0.35,<0.36
- nodejs >=8.9.3,<9
- python >=3.6,<3.7
- python-chromedriver-binary
- robotframework-lint
- robotframework-seleniumlibrary
- selenium =3.8.0
- pip:
- beautysh
- selenium
- beautysh
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"dependencies": {
"@jupyterlab/application": "^0.18.0",
"@jupyterlab/mainmenu": "^0.7.2",
"@jupyterlab/application": "^0.19.1",
"@jupyterlab/mainmenu": "^0.8.1",
"@phosphor/commands": "^1.5.0",
"@phosphor/coreutils": "^1.3.0",
"@phosphor/widgets": "^1.6.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/jupyterlab-font-anonymous-pro/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"typeface-anonymous-pro": "^0.0.54",
"@jupyterlab/application": "^0.18.0"
"@jupyterlab/application": "^0.19.1"
},
"devDependencies": {
"@types/webpack-env": "~1.13.6"
Expand All @@ -35,7 +35,7 @@
"url": "https://github.com/deathbeds/jupyterlab-fonts.git"
},
"types": "lib/index.d.ts",
"version": "0.5.0",
"version": "0.6.0",
"scripts": {
"build": "tsc",
"watch": "tsc -w"
Expand Down
4 changes: 2 additions & 2 deletions packages/jupyterlab-font-dejavu-sans-mono/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"@deathbeds/jupyterlab-fonts": "^0.5.0"
},
"dependencies": {
"@jupyterlab/application": "^0.18.0"
"@jupyterlab/application": "^0.19.1"
},
"devDependencies": {
"dejavu-fonts-ttf": "2.37.3",
Expand Down Expand Up @@ -35,7 +35,7 @@
"url": "https://github.com/deathbeds/jupyterlab-fonts.git"
},
"types": "lib/index.d.ts",
"version": "0.5.0",
"version": "0.6.0",
"scripts": {
"build": "python scripts/convert.py && tsc",
"watch": "tsc -w"
Expand Down
4 changes: 2 additions & 2 deletions packages/jupyterlab-font-fira-code/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"dependencies": {
"firacode": "^1.205.0",
"@jupyterlab/application": "^0.18.0"
"@jupyterlab/application": "^0.19.1"
},
"devDependencies": {
"@types/webpack-env": "~1.13.6"
Expand All @@ -34,7 +34,7 @@
"url": "https://github.com/deathbeds/jupyterlab-fonts.git"
},
"types": "lib/index.d.ts",
"version": "0.5.0",
"version": "0.6.0",
"scripts": {
"build": "tsc",
"watch": "tsc -w"
Expand Down
8 changes: 4 additions & 4 deletions packages/jupyterlab-fonts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"url": "https://github.com/deathbeds/jupyterlab-fonts.git"
},
"types": "lib/index.d.ts",
"version": "0.5.0",
"version": "0.6.0",
"dependencies": {
"@jupyterlab/application": "^0.18.0",
"@jupyterlab/mainmenu": "^0.7.2",
"@jupyterlab/notebook": "^0.18.0",
"@jupyterlab/application": "^0.19.1",
"@jupyterlab/mainmenu": "^0.8.1",
"@jupyterlab/notebook": "^0.19.2",
"@phosphor/commands": "^1.5.0",
"@phosphor/coreutils": "^1.3.0",
"@phosphor/widgets": "^1.6.0",
Expand Down
3 changes: 2 additions & 1 deletion packages/jupyterlab-fonts/src/button.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ export class NotebookFontsButton
panel: NotebookPanel,
context: DocumentRegistry.IContext<INotebookModel>
): IDisposable {
console.log('wooo');
let button = new ToolbarButton({
className: ICON_CLASS,
iconClassName: ICON_CLASS + ' jp-Icon jp-Icon-16',
onClick: () => {
(this.widgetRequested as Signal<any, void>).emit(void 0);
},
Expand Down
18 changes: 9 additions & 9 deletions tests/resources/Lab.robot
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ${LAB_CMD} jupyter-lab --no-browser --NotebookApp.token=${TOKEN} --port 1
${LAB_URL} http://localhost:18888/lab?token=${TOKEN}
${SPLASH_ID} jupyterlab-splash
${SPINNER} css:.jp-Spinner
${CMD_PAL_XPATH} //div[contains(@class, "jp-mod-left")]//li[@title = "Command Palette"]//div
${CMD_PAL_CSS} css:.jp-mod-left li[title^="Commands"] div
${CMD_PAL_INPUT} css:.p-CommandPalette-input
${CMD_PAL_ITEM} css:.p-CommandPalette-item
${TOP} //div[@id='jp-top-panel']
Expand Down Expand Up @@ -39,7 +39,7 @@ Wait for Splash Screen
Launch a new
[Arguments] ${kernel} ${category}
[Documentation] Use the JupyterLab launcher to launch Notebook or Console
Click Element ${CARD}[@title='${kernel}'][@data-category='${category}']
Click Element ${CARD}\[@title='${kernel}'][@data-category='${category}']
Wait Until Page Does Not Contain Element ${SPINNER}
Wait Until Page Contains Element css:${CELL_CSS}

Expand All @@ -50,17 +50,17 @@ Start JupyterLab
Click JupyterLab Menu
[Arguments] ${menu_label}
[Documentation] Click a top-level JupyterLab Menu bar, e.g. File, Help, etc.
Wait Until Page Contains Element ${TOP}${BAR_ITEM}[text() = '${menu_label}']
Mouse Over ${TOP}${BAR_ITEM}[text() = '${menu_label}']
Click Element ${TOP}${BAR_ITEM}[text() = '${menu_label}']
Wait Until Page Contains Element ${TOP}${BAR_ITEM}\[text() = '${menu_label}']
Mouse Over ${TOP}${BAR_ITEM}\[text() = '${menu_label}']
Click Element ${TOP}${BAR_ITEM}\[text() = '${menu_label}']

Click JupyterLab Menu Item
[Arguments] ${item_label}
[Documentation] Click a top-level JupyterLab Menu Item (not File, Help, etc.)
${item} = Set Variable //div[@class='p-Menu-itemLabel']
Wait Until Page Contains Element ${item}[text() = '${item_label}']
Mouse Over ${item}[text() = '${item_label}']
Click Element ${item}[text() = '${item_label}']
Wait Until Page Contains Element ${item}\[text() = '${item_label}']
Mouse Over ${item}\[text() = '${item_label}']
Click Element ${item}\[text() = '${item_label}']

Open JupyterLab with
[Arguments] ${browser}
Expand All @@ -73,7 +73,7 @@ Execute JupyterLab Command
[Arguments] ${command}
[Documentation] Use the JupyterLab Command Palette to run a command
Run Keyword And Ignore Error Click Element css:.jp-mod-accept
Click Element ${CMD_PAL_XPATH}
Click Element ${CMD_PAL_CSS}
Input Text ${CMD_PAL_INPUT} ${command}
Wait Until Page Contains Element ${CMD_PAL_ITEM}
Click Element ${CMD_PAL_ITEM}
Expand Down
Loading

0 comments on commit 41c7cd8

Please sign in to comment.