Skip to content

Commit 2f7b810

Browse files
authored
Update to JupyterLab beta 2 (#130)
* Update to beta 2 * Fix yjs error message * Update snapshot
1 parent e17750b commit 2f7b810

9 files changed

+229
-379
lines changed

package.json

+21-17
Original file line numberDiff line numberDiff line change
@@ -61,18 +61,18 @@
6161
"@jupyter/collaboration": "^1.0.0-alpha.7",
6262
"@jupyter/docprovider": "^1.0.0-alpha.8",
6363
"@jupyter/ydoc": "^0.3.4 || ^1.0.2",
64-
"@jupyterlab/application": "^4.0.0-beta.0",
65-
"@jupyterlab/apputils": "^4.0.0-beta.0",
66-
"@jupyterlab/coreutils": "^6.0.0-beta.0",
67-
"@jupyterlab/docregistry": "^4.0.0-beta.0",
68-
"@jupyterlab/filebrowser": "^4.0.0-beta.0",
69-
"@jupyterlab/launcher": "^4.0.0-beta.0",
70-
"@jupyterlab/mainmenu": "^4.0.0-beta.0",
71-
"@jupyterlab/notebook": "^4.0.0-beta.0",
72-
"@jupyterlab/observables": "^5.0.0-beta.0",
73-
"@jupyterlab/services": "^7.0.0-beta.0",
74-
"@jupyterlab/translation": "^4.0.0-beta.0",
75-
"@jupyterlab/ui-components": "^4.0.0-beta.0",
64+
"@jupyterlab/application": "^4.0.0-beta.2",
65+
"@jupyterlab/apputils": "^4.0.0-beta.2",
66+
"@jupyterlab/coreutils": "^6.0.0-beta.2",
67+
"@jupyterlab/docregistry": "^4.0.0-beta.2",
68+
"@jupyterlab/filebrowser": "^4.0.0-beta.2",
69+
"@jupyterlab/launcher": "^4.0.0-beta.2",
70+
"@jupyterlab/mainmenu": "^4.0.0-beta.2",
71+
"@jupyterlab/notebook": "^4.0.0-beta.2",
72+
"@jupyterlab/observables": "^5.0.0-beta.2",
73+
"@jupyterlab/services": "^7.0.0-beta.2",
74+
"@jupyterlab/translation": "^4.0.0-beta.2",
75+
"@jupyterlab/ui-components": "^4.0.0-beta.2",
7676
"@lumino/commands": "^2.0.0",
7777
"@lumino/coreutils": "^2.0.0",
7878
"@lumino/signaling": "^2.0.0",
@@ -91,14 +91,14 @@
9191
"uuid": "^8.3.2"
9292
},
9393
"resolutions": {
94-
"@jupyterlab/apputils": "~4.0.0-beta.1",
94+
"@jupyterlab/apputils": "~4.0.0-beta.2",
9595
"@lumino/coreutils": "^2.0.0",
96-
"@jupyterlab/notebook": "~4.0.0-beta.1",
97-
"@jupyterlab/services": " ^7.0.0-beta.0"
96+
"@jupyterlab/notebook": "~4.0.0-beta.2",
97+
"@jupyterlab/services": " ^7.0.0-beta.2"
9898
},
9999
"devDependencies": {
100100
"@apidevtools/json-schema-ref-parser": "^9.0.9",
101-
"@jupyterlab/builder": "^4.0.0-beta.0",
101+
"@jupyterlab/builder": "^4.0.0-beta.2",
102102
"@types/node": "^16.11.10",
103103
"@typescript-eslint/eslint-plugin": "^4.8.1",
104104
"@typescript-eslint/parser": "^4.8.1",
@@ -132,7 +132,11 @@
132132
"@jupyter-widgets/base": {
133133
"bundled": false,
134134
"singleton": true
135+
},
136+
"yjs": {
137+
"bundled": false,
138+
"singleton": true
135139
}
136140
}
137141
}
138-
}
142+
}

ui-tests/jupyter_server_test_config.py

+2-10
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,10 @@
44
opens the server to the world and provide access to JupyterLab
55
JavaScript objects through the global window variable.
66
"""
7-
import os
8-
from tempfile import mkdtemp
97

10-
c.ServerApp.port = 8888
11-
c.ServerApp.port_retries = 0
12-
c.ServerApp.open_browser = False
8+
from jupyterlab.galata import configure_jupyter_server
139

14-
c.ServerApp.root_dir = mkdtemp(prefix='galata-test-')
15-
c.ServerApp.token = ""
16-
c.ServerApp.password = ""
17-
c.ServerApp.disable_check_xsrf = True
18-
c.LabApp.expose_app_in_browser = True
10+
configure_jupyter_server(c)
1911
c.LabApp.collaborative = True
2012
# Uncomment to set server log level to debug level
2113
# c.ServerApp.log_level = "DEBUG"

ui-tests/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"test:debug": "PWDEBUG=1 npx playwright test"
1111
},
1212
"devDependencies": {
13-
"@jupyterlab/galata": "5.0.0-alpha.14",
14-
"@playwright/test": "^1.32.3"
13+
"@jupyterlab/galata": "^5.0.0-beta.0",
14+
"@playwright/test": "^1.32.0"
1515
}
1616
}
Loading
Loading

ui-tests/tests/tree.spec.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ test.describe('Tree UI test', () => {
6161
.nth(4)
6262
.click();
6363

64-
// expect(errors).toBe(0);
64+
expect(errors).toBe(0);
6565
const tree = await page.getByRole('region', {
6666
name: 'Objects tree Section'
6767
});

ui-tests/tests/ui.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ test.describe('UI Test', () => {
8989
.click();
9090
await page.waitForTimeout(1000);
9191
const main = await page.$('#jp-main-split-panel');
92-
// expect(errors).toBe(0);
92+
expect(errors).toBe(0);
9393
if (main) {
9494
expect(await main.screenshot()).toMatchSnapshot({
9595
name: `Render-${file}.png`
@@ -152,7 +152,7 @@ test.describe('UI Test', () => {
152152
.click();
153153

154154
await page.waitForTimeout(1000);
155-
// expect(errors).toBe(0);
155+
expect(errors).toBe(0);
156156
const main = await page.$('#jp-main-split-panel');
157157
if (main) {
158158
expect(await main.screenshot()).toMatchSnapshot({
@@ -189,7 +189,7 @@ test.describe('UI Test', () => {
189189
.click();
190190

191191
await page.waitForTimeout(1000);
192-
// expect(errors).toBe(0);
192+
expect(errors).toBe(0);
193193
const main = await page.$('#jp-main-split-panel');
194194
if (main) {
195195
expect(await main.screenshot()).toMatchSnapshot({
@@ -233,7 +233,7 @@ test.describe('UI Test', () => {
233233
.click();
234234

235235
await page.waitForTimeout(1000);
236-
// expect(errors).toBe(0);
236+
expect(errors).toBe(0);
237237
const main = await page.$('#jp-main-split-panel');
238238
if (main) {
239239
expect(await main.screenshot()).toMatchSnapshot({

0 commit comments

Comments
 (0)