@jupyterlab/galata 4.3.4 → 4.3.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +82 -0
- package/lib/contents.d.ts +4 -2
- package/lib/contents.js +32 -18
- package/lib/contents.js.map +1 -1
- package/lib/fixtures.d.ts +11 -11
- package/lib/fixtures.js +3 -3
- package/lib/fixtures.js.map +1 -1
- package/lib/galata.d.ts +5 -3
- package/lib/galata.js +27 -37
- package/lib/galata.js.map +1 -1
- package/lib/jupyterlabpage.d.ts +8 -1
- package/lib/jupyterlabpage.js +9 -4
- package/lib/jupyterlabpage.js.map +1 -1
- package/package.json +9 -9
package/README.md
CHANGED
|
@@ -132,6 +132,88 @@ jupyter lab --config jupyter_server_test_config.py &
|
|
|
132
132
|
PWDEBUG=1 jlpm playwright test
|
|
133
133
|
```
|
|
134
134
|
|
|
135
|
+
### Dealing with login
|
|
136
|
+
|
|
137
|
+
If you have set up a custom login handler for your Jupyter application and don't want to remove it
|
|
138
|
+
for your integration tests, you can try the following configuration (inspired by the
|
|
139
|
+
[Playwright documentation](https://playwright.dev/docs/test-advanced#global-setup-and-teardown)):
|
|
140
|
+
|
|
141
|
+
1. Create a file named `global-setup.ts` at the root of the test folder containing the login steps:
|
|
142
|
+
|
|
143
|
+
```typescript
|
|
144
|
+
// global-setup.ts
|
|
145
|
+
|
|
146
|
+
import { chromium, FullConfig } from '@playwright/test';
|
|
147
|
+
|
|
148
|
+
async function globalSetup(config: FullConfig) {
|
|
149
|
+
const { baseURL, storageState } = config.projects[0].use;
|
|
150
|
+
const browser = await chromium.launch();
|
|
151
|
+
const page = await browser.newPage();
|
|
152
|
+
|
|
153
|
+
// Here follows the step to log in if you setup a known password
|
|
154
|
+
// See the server documentation https://jupyter-server.readthedocs.io/en/latest/operators/public-server.html?#automatic-password-setup
|
|
155
|
+
await page.goto(baseURL ?? process.env.TARGET_URL ?? 'http://localhost:8888');
|
|
156
|
+
await page.locator('input[name="password"]').fill('test');
|
|
157
|
+
await page.locator('text=Log in').click();
|
|
158
|
+
|
|
159
|
+
// Save signed-in state.
|
|
160
|
+
await page.context().storageState({ path: storageState as string });
|
|
161
|
+
await browser.close();
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
export default globalSetup;
|
|
165
|
+
```
|
|
166
|
+
|
|
167
|
+
2. Modify the Playwright configuration file to use that global setup and the stored state:
|
|
168
|
+
|
|
169
|
+
```typescript
|
|
170
|
+
var baseConfig = require('@jupyterlab/galata/lib/playwright-config');
|
|
171
|
+
|
|
172
|
+
module.exports = {
|
|
173
|
+
...baseConfig,
|
|
174
|
+
globalSetup: require.resolve('./global-setup'),
|
|
175
|
+
use: {
|
|
176
|
+
...baseConfig.use,
|
|
177
|
+
// Tell all tests to load signed-in state from 'storageState.json'.
|
|
178
|
+
storageState: 'storageState.json'
|
|
179
|
+
}
|
|
180
|
+
};
|
|
181
|
+
```
|
|
182
|
+
|
|
183
|
+
When you will start your test, a file named `storageStage.json` will be generated if the log in
|
|
184
|
+
steps were successful. Its content will look like that:
|
|
185
|
+
|
|
186
|
+
```json
|
|
187
|
+
{
|
|
188
|
+
"cookies": [
|
|
189
|
+
{
|
|
190
|
+
"name": "_xsrf",
|
|
191
|
+
"value": "...REDACTED...",
|
|
192
|
+
"domain": "localhost",
|
|
193
|
+
"path": "/",
|
|
194
|
+
"expires": -1,
|
|
195
|
+
"httpOnly": false,
|
|
196
|
+
"secure": false,
|
|
197
|
+
"sameSite": "Lax"
|
|
198
|
+
},
|
|
199
|
+
{
|
|
200
|
+
"name": "username-localhost-8888",
|
|
201
|
+
"value": "...REDACTED...",
|
|
202
|
+
"domain": "localhost",
|
|
203
|
+
"path": "/",
|
|
204
|
+
"expires": 1664121119.118241,
|
|
205
|
+
"httpOnly": true,
|
|
206
|
+
"secure": false,
|
|
207
|
+
"sameSite": "Lax"
|
|
208
|
+
}
|
|
209
|
+
],
|
|
210
|
+
"origins": []
|
|
211
|
+
}
|
|
212
|
+
```
|
|
213
|
+
|
|
214
|
+
> This will only work if the authentication is stored in a cookie and you can access the Jupyter
|
|
215
|
+
> app directly when that cookie is set.
|
|
216
|
+
|
|
135
217
|
## Fixtures
|
|
136
218
|
|
|
137
219
|
Here are the new test fixture introduced by Galata on top of [Playwright fixtures](https://playwright.dev/docs/api/class-fixtures).
|
package/lib/contents.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Contents } from '@jupyterlab/services';
|
|
2
|
-
import { Page } from '@playwright/test';
|
|
2
|
+
import { APIRequestContext, Page } from '@playwright/test';
|
|
3
3
|
/**
|
|
4
4
|
* Helper class to interact with contents server API
|
|
5
5
|
*
|
|
@@ -15,8 +15,9 @@ export declare class ContentsHelper {
|
|
|
15
15
|
*
|
|
16
16
|
* @param baseURL Server base URL
|
|
17
17
|
* @param page Playwright page model object
|
|
18
|
+
* @param request Playwright API request context
|
|
18
19
|
*/
|
|
19
|
-
constructor(baseURL: string, page?: Page | undefined);
|
|
20
|
+
constructor(baseURL: string, page?: Page | undefined, request?: APIRequestContext);
|
|
20
21
|
/**
|
|
21
22
|
* Return the model for a path.
|
|
22
23
|
*
|
|
@@ -113,4 +114,5 @@ export declare class ContentsHelper {
|
|
|
113
114
|
waitForAPIResponse(trigger?: () => Promise<void> | void): Promise<void>;
|
|
114
115
|
protected _createDirectory(dirPath: string): Promise<boolean>;
|
|
115
116
|
private _fetch;
|
|
117
|
+
readonly request: APIRequestContext | null;
|
|
116
118
|
}
|
package/lib/contents.js
CHANGED
|
@@ -43,10 +43,18 @@ class ContentsHelper {
|
|
|
43
43
|
*
|
|
44
44
|
* @param baseURL Server base URL
|
|
45
45
|
* @param page Playwright page model object
|
|
46
|
+
* @param request Playwright API request context
|
|
46
47
|
*/
|
|
47
|
-
constructor(baseURL, page) {
|
|
48
|
+
constructor(baseURL, page, request) {
|
|
48
49
|
this.baseURL = baseURL;
|
|
49
50
|
this.page = page;
|
|
51
|
+
this.request = null;
|
|
52
|
+
if (request) {
|
|
53
|
+
this.request = request;
|
|
54
|
+
}
|
|
55
|
+
else if (page) {
|
|
56
|
+
this.request = page.context().request;
|
|
57
|
+
}
|
|
50
58
|
}
|
|
51
59
|
/**
|
|
52
60
|
* Return the model for a path.
|
|
@@ -56,28 +64,21 @@ class ContentsHelper {
|
|
|
56
64
|
* @returns Element metadata
|
|
57
65
|
*/
|
|
58
66
|
async getContentMetadata(path, type = 'file') {
|
|
59
|
-
const baseUrl = this.page ? await Utils.getBaseUrl(this.page) : '/';
|
|
60
|
-
const token = this.page ? await Utils.getToken(this.page) : '';
|
|
61
|
-
const apiUrl = `${this.baseURL}${baseUrl}api/contents`;
|
|
62
67
|
const data = {
|
|
63
68
|
type,
|
|
64
69
|
// Get the content only for directory
|
|
65
70
|
content: type === 'directory' ? 1 : 0
|
|
66
71
|
};
|
|
67
|
-
const request = {
|
|
68
|
-
method: 'GET'
|
|
69
|
-
};
|
|
70
|
-
if (token) {
|
|
71
|
-
request.headers = { Authorization: `Token ${token}` };
|
|
72
|
-
}
|
|
73
72
|
let response = null;
|
|
74
73
|
try {
|
|
75
|
-
response = await
|
|
74
|
+
response = await this._fetch(path + coreutils_1.URLExt.objectToQueryString(data));
|
|
76
75
|
}
|
|
77
76
|
catch (error) {
|
|
78
77
|
console.error(`Fail to get content metadata for ${path}`, error);
|
|
79
78
|
}
|
|
80
|
-
const succeeded = (response === null || response === void 0 ? void 0 : response.status) ===
|
|
79
|
+
const succeeded = (typeof (response === null || response === void 0 ? void 0 : response.status) === 'function'
|
|
80
|
+
? response.status()
|
|
81
|
+
: response === null || response === void 0 ? void 0 : response.status) === 200;
|
|
81
82
|
if (succeeded) {
|
|
82
83
|
return response.json();
|
|
83
84
|
}
|
|
@@ -175,7 +176,9 @@ class ContentsHelper {
|
|
|
175
176
|
catch (error) {
|
|
176
177
|
console.error(`Failed to upload content to server ${destinationPath}`, error);
|
|
177
178
|
}
|
|
178
|
-
const succeeded = (response === null || response === void 0 ? void 0 : response.status) ===
|
|
179
|
+
const succeeded = (typeof (response === null || response === void 0 ? void 0 : response.status) === 'function'
|
|
180
|
+
? response.status()
|
|
181
|
+
: response === null || response === void 0 ? void 0 : response.status) === 201;
|
|
179
182
|
if (succeeded) {
|
|
180
183
|
return await this.fileExists(destinationPath);
|
|
181
184
|
}
|
|
@@ -210,7 +213,9 @@ class ContentsHelper {
|
|
|
210
213
|
catch (error) {
|
|
211
214
|
console.error(`Failed to delete file ${filePath}`, error);
|
|
212
215
|
}
|
|
213
|
-
const succeeded = (response === null || response === void 0 ? void 0 : response.status) ===
|
|
216
|
+
const succeeded = (typeof (response === null || response === void 0 ? void 0 : response.status) === 'function'
|
|
217
|
+
? response.status()
|
|
218
|
+
: response === null || response === void 0 ? void 0 : response.status) === 204;
|
|
214
219
|
if (succeeded) {
|
|
215
220
|
return !(await this.fileExists(fileName));
|
|
216
221
|
}
|
|
@@ -277,7 +282,9 @@ class ContentsHelper {
|
|
|
277
282
|
catch (error) {
|
|
278
283
|
console.error(`Failed to rename file ${oldName} to ${newName}`, error);
|
|
279
284
|
}
|
|
280
|
-
const succeeded = (response === null || response === void 0 ? void 0 : response.status) ===
|
|
285
|
+
const succeeded = (typeof (response === null || response === void 0 ? void 0 : response.status) === 'function'
|
|
286
|
+
? response.status()
|
|
287
|
+
: response === null || response === void 0 ? void 0 : response.status) === 200;
|
|
281
288
|
if (succeeded) {
|
|
282
289
|
return await this.fileExists(newName);
|
|
283
290
|
}
|
|
@@ -322,17 +329,24 @@ class ContentsHelper {
|
|
|
322
329
|
catch (error) {
|
|
323
330
|
console.error(`Failed to create directory ${dirPath}`, error);
|
|
324
331
|
}
|
|
325
|
-
return (response === null || response === void 0 ? void 0 : response.status) ===
|
|
332
|
+
return ((typeof (response === null || response === void 0 ? void 0 : response.status) === 'function'
|
|
333
|
+
? response.status()
|
|
334
|
+
: response === null || response === void 0 ? void 0 : response.status) === 201);
|
|
326
335
|
}
|
|
327
336
|
async _fetch(path, request = { method: 'GET' }) {
|
|
328
337
|
const baseUrl = this.page ? await Utils.getBaseUrl(this.page) : '/';
|
|
329
338
|
const token = this.page ? await Utils.getToken(this.page) : '';
|
|
330
|
-
|
|
339
|
+
let url = coreutils_1.URLExt.join(baseUrl, 'api/contents', path);
|
|
331
340
|
if (token) {
|
|
332
341
|
request.headers = { Authorization: `Token ${token}` };
|
|
333
342
|
}
|
|
334
343
|
let response = null;
|
|
335
|
-
|
|
344
|
+
if (this.request) {
|
|
345
|
+
response = await this.request.fetch(url, Object.assign(Object.assign({}, request), { data: request.body }));
|
|
346
|
+
}
|
|
347
|
+
else {
|
|
348
|
+
response = await node_fetch_1.default(coreutils_1.URLExt.join(this.baseURL, url), request);
|
|
349
|
+
}
|
|
336
350
|
return response;
|
|
337
351
|
}
|
|
338
352
|
}
|
package/lib/contents.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"contents.js","sourceRoot":"","sources":["../src/contents.ts"],"names":[],"mappings":";AAAA,0CAA0C;AAC1C,2DAA2D;;;;;;;;;;;;;;;;;;;;;;;;;AAE3D,qDAA+C;AAI/C,4DAA0D;AAC1D,2CAA6B;AAC7B,4CAGyB;AACzB,+CAAiC;AAEjC;;;;;;GAMG;AACH,MAAa,cAAc;IACzB
|
|
1
|
+
{"version":3,"file":"contents.js","sourceRoot":"","sources":["../src/contents.ts"],"names":[],"mappings":"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"}
|
package/lib/fixtures.d.ts
CHANGED
|
@@ -39,16 +39,6 @@ export declare type GalataOptions = {
|
|
|
39
39
|
* Default: true
|
|
40
40
|
*/
|
|
41
41
|
autoGoto: boolean;
|
|
42
|
-
/**
|
|
43
|
-
* Galata can keep the uploaded and created files in ``tmpPath`` on
|
|
44
|
-
* the server root for debugging purpose. By default the files are
|
|
45
|
-
* always deleted
|
|
46
|
-
*
|
|
47
|
-
* - 'off' - ``tmpPath`` is deleted after each tests
|
|
48
|
-
* - 'on' - ``tmpPath`` is never deleted
|
|
49
|
-
* - 'only-on-failure' - ``tmpPath`` is deleted except if a test failed or timed out.
|
|
50
|
-
*/
|
|
51
|
-
serverFiles: 'on' | 'off' | 'only-on-failure';
|
|
52
42
|
/**
|
|
53
43
|
* Mock JupyterLab state in-memory or not.
|
|
54
44
|
*
|
|
@@ -74,6 +64,16 @@ export declare type GalataOptions = {
|
|
|
74
64
|
* they are still initialized with the hard drive values.
|
|
75
65
|
*/
|
|
76
66
|
mockSettings: boolean | Record<string, unknown>;
|
|
67
|
+
/**
|
|
68
|
+
* Galata can keep the uploaded and created files in ``tmpPath`` on
|
|
69
|
+
* the server root for debugging purpose. By default the files are
|
|
70
|
+
* always deleted
|
|
71
|
+
*
|
|
72
|
+
* - 'off' - ``tmpPath`` is deleted after each tests
|
|
73
|
+
* - 'on' - ``tmpPath`` is never deleted
|
|
74
|
+
* - 'only-on-failure' - ``tmpPath`` is deleted except if a test failed or timed out.
|
|
75
|
+
*/
|
|
76
|
+
serverFiles: 'on' | 'off' | 'only-on-failure';
|
|
77
77
|
/**
|
|
78
78
|
* Sessions created during the test.
|
|
79
79
|
*
|
|
@@ -102,7 +102,7 @@ export declare type GalataOptions = {
|
|
|
102
102
|
*/
|
|
103
103
|
tmpPath: string;
|
|
104
104
|
/**
|
|
105
|
-
* Wait for the application page to be ready
|
|
105
|
+
* Wait for the application page to be ready.
|
|
106
106
|
*
|
|
107
107
|
* @param page Playwright Page model
|
|
108
108
|
* @param helpers JupyterLab helpers
|
package/lib/fixtures.js
CHANGED
|
@@ -129,12 +129,12 @@ exports.test = test_1.test.extend({
|
|
|
129
129
|
* Note: if you override this string, you will need to take care of creating the
|
|
130
130
|
* folder and cleaning it.
|
|
131
131
|
*/
|
|
132
|
-
tmpPath: async ({ baseURL, serverFiles }, use, testInfo) => {
|
|
132
|
+
tmpPath: async ({ baseURL, serverFiles, request }, use, testInfo) => {
|
|
133
133
|
// Remove appended retry part for reproducibility
|
|
134
134
|
const testFolder = path
|
|
135
135
|
.basename(testInfo.outputDir)
|
|
136
136
|
.replace(/-retry\d+$/i, '');
|
|
137
|
-
const contents = new contents_1.ContentsHelper(baseURL);
|
|
137
|
+
const contents = new contents_1.ContentsHelper(baseURL, undefined, request);
|
|
138
138
|
if (await contents.directoryExists(testFolder)) {
|
|
139
139
|
await contents.deleteDirectory(testFolder);
|
|
140
140
|
}
|
|
@@ -155,7 +155,7 @@ exports.test = test_1.test.extend({
|
|
|
155
155
|
* @param page Playwright Page model
|
|
156
156
|
* @param helpers JupyterLab helpers
|
|
157
157
|
*/
|
|
158
|
-
waitForApplication: async ({ baseURL }, use
|
|
158
|
+
waitForApplication: async ({ baseURL }, use) => {
|
|
159
159
|
const waitIsReady = async (page, helpers) => {
|
|
160
160
|
await page.waitForSelector('#jupyterlab-splash', {
|
|
161
161
|
state: 'detached'
|
package/lib/fixtures.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../src/fixtures.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,0CAA0C;AAC1C,2DAA2D;;;;;;;;;;;;;;;;;;;;;;AAG3D,2CAQ0B;AAC1B,2CAA6B;AAC7B,yCAA4C;AAC5C,qCAAkC;AAiHlC;;GAEG;AACH,aAAa;AACA,QAAA,IAAI,GAGb,WAAI,CAAC,MAAM,CAAgB;IAC7B;;;;;OAKG;IACH,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;;QAClC,MAAM,GAAG,OAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,OAAO,CAAC,GAAG,CAAC,UAAU,mCAAI,uBAAuB,CAAC,CAAC;IAC1E,CAAC;IACD;;;;OAIG;IACH,OAAO,EAAE,MAAM;IACf;;;;;;OAMG;IACH,QAAQ,EAAE,IAAI;IACd;;;;;;;;;OASG;IACH,SAAS,EAAE,IAAI;IACf;;;;;;;;;;;;OAYG;IACH,YAAY,EAAE,eAAM,CAAC,gBAAgB;IACrC;;;;;;;;OAQG;IACH,WAAW,EAAE,KAAK;IAClB;;;;;;;;OAQG;IACH,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;QAEnD,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEpB,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE;YACrB,MAAM,eAAM,CAAC,IAAI,CAAC,YAAY,CAC5B,OAAQ,EACR,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,EACpB,UAAU,CACX,CAAC;SACH;IACH,CAAC;IACD;;;;;;;;OAQG;IACH,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;QACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAC;QAExD,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;QAErB,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE;YACtB,MAAM,eAAM,CAAC,IAAI,CAAC,YAAY,CAC5B,OAAQ,EACR,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,EACrB,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IACD;;;;;OAKG;IACH,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;
|
|
1
|
+
{"version":3,"file":"fixtures.js","sourceRoot":"","sources":["../src/fixtures.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,0CAA0C;AAC1C,2DAA2D;;;;;;;;;;;;;;;;;;;;;;AAG3D,2CAQ0B;AAC1B,2CAA6B;AAC7B,yCAA4C;AAC5C,qCAAkC;AAiHlC;;GAEG;AACH,aAAa;AACA,QAAA,IAAI,GAGb,WAAI,CAAC,MAAM,CAAgB;IAC7B;;;;;OAKG;IACH,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;;QAClC,MAAM,GAAG,OAAC,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,OAAO,CAAC,GAAG,CAAC,UAAU,mCAAI,uBAAuB,CAAC,CAAC;IAC1E,CAAC;IACD;;;;OAIG;IACH,OAAO,EAAE,MAAM;IACf;;;;;;OAMG;IACH,QAAQ,EAAE,IAAI;IACd;;;;;;;;;OASG;IACH,SAAS,EAAE,IAAI;IACf;;;;;;;;;;;;OAYG;IACH,YAAY,EAAE,eAAM,CAAC,gBAAgB;IACrC;;;;;;;;OAQG;IACH,WAAW,EAAE,KAAK;IAClB;;;;;;;;OAQG;IACH,QAAQ,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;QACnC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAA0B,CAAC;QAEnD,MAAM,GAAG,CAAC,QAAQ,CAAC,CAAC;QAEpB,IAAI,QAAQ,CAAC,IAAI,GAAG,CAAC,EAAE;YACrB,MAAM,eAAM,CAAC,IAAI,CAAC,YAAY,CAC5B,OAAQ,EACR,CAAC,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,EACpB,UAAU,CACX,CAAC;SACH;IACH,CAAC;IACD;;;;;;;;OAQG;IACH,SAAS,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;QACpC,MAAM,SAAS,GAAG,IAAI,GAAG,EAA8B,CAAC;QAExD,MAAM,GAAG,CAAC,SAAS,CAAC,CAAC;QAErB,IAAI,SAAS,CAAC,IAAI,GAAG,CAAC,EAAE;YACtB,MAAM,eAAM,CAAC,IAAI,CAAC,YAAY,CAC5B,OAAQ,EACR,CAAC,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,EACrB,WAAW,CACZ,CAAC;SACH;IACH,CAAC;IACD;;;;;OAKG;IACH,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE;QAClE,iDAAiD;QACjD,MAAM,UAAU,GAAG,IAAI;aACpB,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC;aAC5B,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAE9B,MAAM,QAAQ,GAAG,IAAI,yBAAc,CAAC,OAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;QAElE,IAAI,MAAM,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE;YAC9C,MAAM,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;SAC5C;QAED,uCAAuC;QACvC,MAAM,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;QAE3C,MAAM,GAAG,CAAC,UAAU,CAAC,CAAC;QAEtB,uCAAuC;QACvC,kFAAkF;QAClF,IACE,WAAW,KAAK,KAAK;YACrB,CAAC,WAAW,KAAK,iBAAiB;gBAChC,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,EAClE;YACA,MAAM,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;SAC5C;IACH,CAAC;IACD;;;;;OAKG;IACH,kBAAkB,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,EAAE;QAC7C,MAAM,WAAW,GAAG,KAAK,EACvB,IAAU,EACV,OAAwB,EACT,EAAE;YACjB,MAAM,IAAI,CAAC,eAAe,CAAC,oBAAoB,EAAE;gBAC/C,KAAK,EAAE,UAAU;aAClB,CAAC,CAAC;YACH,MAAM,OAAO,CAAC,gBAAgB,CAAC,GAAG,EAAE;gBAClC,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;YAClD,CAAC,CAAC,CAAC;YAEH,gDAAgD;YAChD,IAAI,CAAC,CAAC,MAAM,OAAO,CAAC,cAAc,EAAE,CAAC,EAAE;gBACrC,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;aAChD;QACH,CAAC,CAAC;QACF,MAAM,GAAG,CAAC,WAAW,CAAC,CAAC;IACzB,CAAC;IACD;;;;;;;;;;;;;;OAcG;IACH,aAAa;IACb,IAAI,EAAE,KAAK,EACT,EACE,OAAO,EACP,QAAQ,EACR,OAAO,EACP,YAAY,EACZ,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,EACP,kBAAkB,EACnB,EACD,GAAG,EACH,EAAE;QACF,MAAM,GAAG,CACP,MAAM,eAAM,CAAC,YAAY,CACvB,OAAO,EACP,QAAQ,EACR,OAAQ,EACR,YAAY,EACZ,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,SAAS,EACT,OAAO,EACP,kBAAkB,CACnB,CACF,CAAC;IACJ,CAAC;CACF,CAAC,CAAC"}
|
package/lib/galata.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import * as nbformat from '@jupyterlab/nbformat';
|
|
2
2
|
import { Session, TerminalAPI, Workspace } from '@jupyterlab/services';
|
|
3
3
|
import { ISettingRegistry } from '@jupyterlab/settingregistry';
|
|
4
|
-
import { Browser, Page } from '@playwright/test';
|
|
4
|
+
import { APIRequestContext, Browser, Page } from '@playwright/test';
|
|
5
5
|
import { ContentsHelper } from './contents';
|
|
6
6
|
import { PerformanceHelper } from './helpers';
|
|
7
7
|
import { IJupyterLabPage, IJupyterLabPageFixture } from './jupyterlabpage';
|
|
@@ -50,9 +50,10 @@ export declare namespace galata {
|
|
|
50
50
|
*
|
|
51
51
|
* @param baseURL Application base URL
|
|
52
52
|
* @param page Playwright page model
|
|
53
|
+
* @param request Playwright API request context
|
|
53
54
|
* @returns Contents REST API helpers
|
|
54
55
|
*/
|
|
55
|
-
function newContentsHelper(baseURL: string, page?: Page): ContentsHelper;
|
|
56
|
+
function newContentsHelper(baseURL: string, page?: Page, request?: APIRequestContext): ContentsHelper;
|
|
56
57
|
/**
|
|
57
58
|
* Create a page with Galata helpers for the given browser
|
|
58
59
|
*
|
|
@@ -154,9 +155,10 @@ export declare namespace galata {
|
|
|
154
155
|
* @param baseURL Application base URL
|
|
155
156
|
* @param runners Session or terminal ids to stop
|
|
156
157
|
* @param type Type of runner; session or terminal
|
|
158
|
+
* @param request API request context
|
|
157
159
|
* @returns Whether the runners were closed or not
|
|
158
160
|
*/
|
|
159
|
-
function clearRunners(baseURL: string, runners: string[], type: 'sessions' | 'terminals'): Promise<boolean>;
|
|
161
|
+
function clearRunners(baseURL: string, runners: string[], type: 'sessions' | 'terminals', request?: APIRequestContext): Promise<boolean>;
|
|
160
162
|
/**
|
|
161
163
|
* Mock the runners API to display only those created during a test
|
|
162
164
|
*
|
package/lib/galata.js
CHANGED
|
@@ -122,10 +122,11 @@ var galata;
|
|
|
122
122
|
*
|
|
123
123
|
* @param baseURL Application base URL
|
|
124
124
|
* @param page Playwright page model
|
|
125
|
+
* @param request Playwright API request context
|
|
125
126
|
* @returns Contents REST API helpers
|
|
126
127
|
*/
|
|
127
|
-
function newContentsHelper(baseURL, page) {
|
|
128
|
-
return new contents_1.ContentsHelper(baseURL, page);
|
|
128
|
+
function newContentsHelper(baseURL, page, request) {
|
|
129
|
+
return new contents_1.ContentsHelper(baseURL, page, request);
|
|
129
130
|
}
|
|
130
131
|
galata.newContentsHelper = newContentsHelper;
|
|
131
132
|
/**
|
|
@@ -296,11 +297,18 @@ var galata;
|
|
|
296
297
|
* @param baseURL Application base URL
|
|
297
298
|
* @param runners Session or terminal ids to stop
|
|
298
299
|
* @param type Type of runner; session or terminal
|
|
300
|
+
* @param request API request context
|
|
299
301
|
* @returns Whether the runners were closed or not
|
|
300
302
|
*/
|
|
301
|
-
async function clearRunners(baseURL, runners, type) {
|
|
302
|
-
const responses = await Promise.all([...new Set(runners)].map(id =>
|
|
303
|
-
|
|
303
|
+
async function clearRunners(baseURL, runners, type, request) {
|
|
304
|
+
const responses = await Promise.all([...new Set(runners)].map(id => request
|
|
305
|
+
? request.fetch(`/api/${type}/${id}`, {
|
|
306
|
+
method: 'DELETE'
|
|
307
|
+
})
|
|
308
|
+
: node_fetch_1.default(`${baseURL}/api/${type}/${id}`, {
|
|
309
|
+
method: 'DELETE'
|
|
310
|
+
})));
|
|
311
|
+
return responses.every(response => typeof response.ok === 'function' ? response.ok() : response.ok);
|
|
304
312
|
}
|
|
305
313
|
Mock.clearRunners = clearRunners;
|
|
306
314
|
/**
|
|
@@ -340,14 +348,11 @@ var galata;
|
|
|
340
348
|
if (id) {
|
|
341
349
|
if (runners.has(id)) {
|
|
342
350
|
// Proxy the GET request
|
|
343
|
-
const response = await
|
|
344
|
-
|
|
345
|
-
method: request.method()
|
|
346
|
-
});
|
|
347
|
-
if (!response.ok) {
|
|
351
|
+
const response = await ctxt.request.fetch(request);
|
|
352
|
+
if (!response.ok()) {
|
|
348
353
|
if (!page.isClosed() && !isClosed) {
|
|
349
354
|
return route.fulfill({
|
|
350
|
-
status: response.status,
|
|
355
|
+
status: response.status(),
|
|
351
356
|
body: await response.text()
|
|
352
357
|
});
|
|
353
358
|
}
|
|
@@ -376,14 +381,11 @@ var galata;
|
|
|
376
381
|
}
|
|
377
382
|
else {
|
|
378
383
|
// Proxy the GET request
|
|
379
|
-
const response = await
|
|
380
|
-
|
|
381
|
-
method: request.method()
|
|
382
|
-
});
|
|
383
|
-
if (!response.ok) {
|
|
384
|
+
const response = await ctxt.request.fetch(request);
|
|
385
|
+
if (!response.ok()) {
|
|
384
386
|
if (!page.isClosed() && !isClosed) {
|
|
385
387
|
return route.fulfill({
|
|
386
|
-
status: response.status,
|
|
388
|
+
status: response.status(),
|
|
387
389
|
body: await response.text()
|
|
388
390
|
});
|
|
389
391
|
}
|
|
@@ -417,15 +419,11 @@ var galata;
|
|
|
417
419
|
}
|
|
418
420
|
case 'PATCH': {
|
|
419
421
|
// Proxy the PATCH request
|
|
420
|
-
const response = await
|
|
421
|
-
|
|
422
|
-
headers: await request.allHeaders(),
|
|
423
|
-
method: request.method()
|
|
424
|
-
});
|
|
425
|
-
if (!response.ok) {
|
|
422
|
+
const response = await ctxt.request.fetch(request);
|
|
423
|
+
if (!response.ok()) {
|
|
426
424
|
if (!page.isClosed() && !isClosed) {
|
|
427
425
|
return route.fulfill({
|
|
428
|
-
status: response.status,
|
|
426
|
+
status: response.status(),
|
|
429
427
|
body: await response.text()
|
|
430
428
|
});
|
|
431
429
|
}
|
|
@@ -445,15 +443,11 @@ var galata;
|
|
|
445
443
|
}
|
|
446
444
|
case 'POST': {
|
|
447
445
|
// Proxy the POST request
|
|
448
|
-
const response = await
|
|
449
|
-
|
|
450
|
-
headers: await request.allHeaders(),
|
|
451
|
-
method: request.method()
|
|
452
|
-
});
|
|
453
|
-
if (!response.ok) {
|
|
446
|
+
const response = await ctxt.request.fetch(request);
|
|
447
|
+
if (!response.ok()) {
|
|
454
448
|
if (!page.isClosed() && !isClosed) {
|
|
455
449
|
return route.fulfill({
|
|
456
|
-
status: response.status,
|
|
450
|
+
status: response.status(),
|
|
457
451
|
body: await response.text()
|
|
458
452
|
});
|
|
459
453
|
}
|
|
@@ -535,9 +529,7 @@ var galata;
|
|
|
535
529
|
if (!id) {
|
|
536
530
|
// Get all settings
|
|
537
531
|
if (settings.length === 0) {
|
|
538
|
-
const response = await
|
|
539
|
-
headers: await request.allHeaders()
|
|
540
|
-
});
|
|
532
|
+
const response = await ctxt.request.fetch(request);
|
|
541
533
|
const loadedSettings = (await response.json())
|
|
542
534
|
.settings;
|
|
543
535
|
settings.push(...loadedSettings.map(plugin => {
|
|
@@ -558,9 +550,7 @@ var galata;
|
|
|
558
550
|
// Get specific settings
|
|
559
551
|
let pluginSettings = settings.find(setting => setting.id === id);
|
|
560
552
|
if (!pluginSettings) {
|
|
561
|
-
const response = await
|
|
562
|
-
headers: await request.allHeaders()
|
|
563
|
-
});
|
|
553
|
+
const response = await ctxt.request.fetch(request);
|
|
564
554
|
pluginSettings = await response.json();
|
|
565
555
|
if (pluginSettings) {
|
|
566
556
|
const mocked = (_c = mockedSettings[id]) !== null && _c !== void 0 ? _c : {};
|
package/lib/galata.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"galata.js","sourceRoot":"","sources":["../src/galata.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"galata.js","sourceRoot":"","sources":["../src/galata.ts"],"names":[],"mappings":"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"}
|
package/lib/jupyterlabpage.d.ts
CHANGED
|
@@ -358,8 +358,15 @@ export declare class JupyterLabPage implements IJupyterLabPage {
|
|
|
358
358
|
* - `'domcontentloaded'` - consider operation to be finished when the `DOMContentLoaded` event is fired.
|
|
359
359
|
* - `'load'` - consider operation to be finished when the `load` event is fired.
|
|
360
360
|
* - `'networkidle'` - consider operation to be finished when there are no network connections for at least `500` ms.
|
|
361
|
+
* - `'commit'` - consider operation to be finished when network response is received and the document started loading.
|
|
361
362
|
*/
|
|
362
|
-
waitUntil?: 'load' | 'domcontentloaded' | 'networkidle';
|
|
363
|
+
waitUntil?: 'load' | 'domcontentloaded' | 'networkidle' | 'commit';
|
|
364
|
+
/**
|
|
365
|
+
* Whether to wait for fixture `waitIsReady` or not when reloading.
|
|
366
|
+
*
|
|
367
|
+
* Default is true.
|
|
368
|
+
*/
|
|
369
|
+
waitForIsReady?: boolean;
|
|
363
370
|
}): Promise<Response | null>;
|
|
364
371
|
/**
|
|
365
372
|
* Reset the User Interface
|
package/lib/jupyterlabpage.js
CHANGED
|
@@ -70,7 +70,7 @@ class JupyterLabPage {
|
|
|
70
70
|
};
|
|
71
71
|
this.waitIsReady = waitForApplication;
|
|
72
72
|
this.activity = new helpers_1.ActivityHelper(page);
|
|
73
|
-
this.contents = new contents_1.ContentsHelper(baseURL, page);
|
|
73
|
+
this.contents = new contents_1.ContentsHelper(baseURL, page, page.context().request);
|
|
74
74
|
this.filebrowser = new helpers_1.FileBrowserHelper(page, this.contents);
|
|
75
75
|
this.kernel = new helpers_1.KernelHelper(page);
|
|
76
76
|
this.logconsole = new helpers_1.LogConsoleHelper(page);
|
|
@@ -169,11 +169,16 @@ class JupyterLabPage {
|
|
|
169
169
|
* @param options
|
|
170
170
|
*/
|
|
171
171
|
async reload(options) {
|
|
172
|
-
var _a;
|
|
173
|
-
const response = await this.page.reload(
|
|
172
|
+
var _a, _b;
|
|
173
|
+
const response = await this.page.reload({
|
|
174
|
+
timeout: options === null || options === void 0 ? void 0 : options.timeout,
|
|
175
|
+
waitUntil: (_a = options === null || options === void 0 ? void 0 : options.waitUntil) !== null && _a !== void 0 ? _a : 'domcontentloaded'
|
|
176
|
+
});
|
|
174
177
|
await this.waitForAppStarted();
|
|
175
178
|
await this.hookHelpersUp();
|
|
176
|
-
|
|
179
|
+
if ((_b = options === null || options === void 0 ? void 0 : options.waitForIsReady) !== null && _b !== void 0 ? _b : true) {
|
|
180
|
+
await this.waitIsReady(this.page, this);
|
|
181
|
+
}
|
|
177
182
|
return response;
|
|
178
183
|
}
|
|
179
184
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jupyterlabpage.js","sourceRoot":"","sources":["../src/jupyterlabpage.ts"],"names":[],"mappings":";AAAA,0CAA0C;AAC1C,2DAA2D;;;;;;;;;;;;;;;;;;;;;;AAG3D,2CAA6B;AAC7B,yCAA4C;AAC5C,uCAWmB;AACnB,+CAAiC;AA0NjC;;GAEG;AACH,MAAa,cAAc;IACzB;;;;;;;OAOG;IACH,YACW,IAAU,EACV,OAAe,EACxB,kBAA2E,EAClE,UAAkB,MAAM;QAHxB,SAAI,GAAJ,IAAI,CAAM;QACV,YAAO,GAAP,OAAO,CAAQ;QAEf,YAAO,GAAP,OAAO,CAAiB;QA4LnC;;WAEG;QACH,mBAAc,GAAG,KAAK,IAAsB,EAAE;YAC5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAC9B,2CAA2C,CAC5C,CAAC;YACF,MAAM,OAAO,GAAG,CAAC,OAAM,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,cAAc,EAAC,CAAC,KAAK,MAAM,CAAC;YAExE,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"jupyterlabpage.js","sourceRoot":"","sources":["../src/jupyterlabpage.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@jupyterlab/galata",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.7",
|
|
4
4
|
"description": "JupyterLab UI Testing Framework",
|
|
5
5
|
"homepage": "https://github.com/jupyterlab/jupyterlab",
|
|
6
6
|
"bugs": {
|
|
@@ -47,14 +47,14 @@
|
|
|
47
47
|
"test:update": "playwright test --update-snapshots && jlpm test:benchmark:update"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@jupyterlab/application": "^3.4.
|
|
51
|
-
"@jupyterlab/cells": "^3.4.
|
|
52
|
-
"@jupyterlab/coreutils": "^5.4.
|
|
53
|
-
"@jupyterlab/docmanager": "^3.4.
|
|
54
|
-
"@jupyterlab/nbformat": "^3.4.
|
|
55
|
-
"@jupyterlab/notebook": "^3.4.
|
|
56
|
-
"@jupyterlab/services": "^6.4.
|
|
57
|
-
"@jupyterlab/settingregistry": "^3.4.
|
|
50
|
+
"@jupyterlab/application": "^3.4.7",
|
|
51
|
+
"@jupyterlab/cells": "^3.4.7",
|
|
52
|
+
"@jupyterlab/coreutils": "^5.4.7",
|
|
53
|
+
"@jupyterlab/docmanager": "^3.4.7",
|
|
54
|
+
"@jupyterlab/nbformat": "^3.4.7",
|
|
55
|
+
"@jupyterlab/notebook": "^3.4.7",
|
|
56
|
+
"@jupyterlab/services": "^6.4.7",
|
|
57
|
+
"@jupyterlab/settingregistry": "^3.4.7",
|
|
58
58
|
"@lumino/algorithm": "^1.9.0",
|
|
59
59
|
"@lumino/coreutils": "^1.11.0",
|
|
60
60
|
"@playwright/test": "^1.16.2",
|