@theia/playwright 1.77.0-next.99 → 1.78.0-next.0
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/lib/tests/theia-app-loader.test.d.ts +2 -0
- package/lib/tests/theia-app-loader.test.d.ts.map +1 -0
- package/lib/tests/theia-app-loader.test.js +93 -0
- package/lib/tests/theia-app-loader.test.js.map +1 -0
- package/lib/theia-app-loader.d.ts +15 -1
- package/lib/theia-app-loader.d.ts.map +1 -1
- package/lib/theia-app-loader.js +23 -2
- package/lib/theia-app-loader.js.map +1 -1
- package/package.json +3 -3
- package/src/tests/theia-app-loader.test.ts +103 -0
- package/src/theia-app-loader.ts +30 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"theia-app-loader.test.d.ts","sourceRoot":"","sources":["../../src/tests/theia-app-loader.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,93 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
// *****************************************************************************
|
|
3
|
+
// Copyright (C) 2026 EclipseSource and others.
|
|
4
|
+
//
|
|
5
|
+
// This program and the accompanying materials are made available under the
|
|
6
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
7
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
8
|
+
//
|
|
9
|
+
// This Source Code may also be made available under the following Secondary
|
|
10
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
11
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
12
|
+
// with the GNU Classpath Exception which is available at
|
|
13
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
14
|
+
//
|
|
15
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
|
+
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
const test_1 = require("@playwright/test");
|
|
19
|
+
const theia_app_loader_1 = require("../theia-app-loader");
|
|
20
|
+
const theia_app_1 = require("../theia-app");
|
|
21
|
+
const theia_workspace_1 = require("../theia-workspace");
|
|
22
|
+
class FastTheiaApp extends theia_app_1.TheiaApp {
|
|
23
|
+
waitForShellAndInitialized() {
|
|
24
|
+
// Loading the document is sufficient for loader lifecycle tests.
|
|
25
|
+
return Promise.resolve();
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
class FailingNavigationTheiaApp extends FastTheiaApp {
|
|
29
|
+
isShellVisible() {
|
|
30
|
+
return Promise.reject(new Error('Test navigation failure'));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
class FailingInitializationWorkspace extends theia_workspace_1.TheiaWorkspace {
|
|
34
|
+
initialize() {
|
|
35
|
+
throw new Error('Test workspace initialization failure');
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
test_1.test.describe('TheiaAppLoader browser page lifecycle', () => {
|
|
39
|
+
test_1.test.skip(process.env.USE_ELECTRON === 'true', 'These tests cover browser page ownership.');
|
|
40
|
+
(0, test_1.test)('keeps a loader-created page open after successful loading', async ({ playwright, browser }) => {
|
|
41
|
+
const initialContextCount = browser.contexts().length;
|
|
42
|
+
const app = await theia_app_loader_1.TheiaAppLoader.load({ playwright, browser }, undefined, FastTheiaApp);
|
|
43
|
+
try {
|
|
44
|
+
(0, test_1.expect)(app.page.isClosed()).toBe(false);
|
|
45
|
+
(0, test_1.expect)(browser.contexts()).toHaveLength(initialContextCount + 1);
|
|
46
|
+
}
|
|
47
|
+
finally {
|
|
48
|
+
await app.page.close();
|
|
49
|
+
app.workspace.remove();
|
|
50
|
+
}
|
|
51
|
+
(0, test_1.expect)(browser.contexts()).toHaveLength(initialContextCount);
|
|
52
|
+
});
|
|
53
|
+
(0, test_1.test)('cleans up loader-created contexts after repeated initialization failures', async ({ playwright, browser }) => {
|
|
54
|
+
const initialContextCount = browser.contexts().length;
|
|
55
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
56
|
+
const workspace = new FailingInitializationWorkspace();
|
|
57
|
+
try {
|
|
58
|
+
await (0, test_1.expect)(theia_app_loader_1.TheiaAppLoader.load({ playwright, browser }, workspace, FastTheiaApp))
|
|
59
|
+
.rejects.toThrow('Test workspace initialization failure');
|
|
60
|
+
(0, test_1.expect)(browser.contexts()).toHaveLength(initialContextCount);
|
|
61
|
+
}
|
|
62
|
+
finally {
|
|
63
|
+
workspace.remove();
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
(0, test_1.test)('cleans up a loader-created context after navigation fails', async ({ playwright, browser }) => {
|
|
68
|
+
const initialContextCount = browser.contexts().length;
|
|
69
|
+
const workspace = new theia_workspace_1.TheiaWorkspace();
|
|
70
|
+
try {
|
|
71
|
+
await (0, test_1.expect)(theia_app_loader_1.TheiaAppLoader.load({ playwright, browser }, workspace, FailingNavigationTheiaApp))
|
|
72
|
+
.rejects.toThrow('Test navigation failure');
|
|
73
|
+
(0, test_1.expect)(browser.contexts()).toHaveLength(initialContextCount);
|
|
74
|
+
}
|
|
75
|
+
finally {
|
|
76
|
+
workspace.remove();
|
|
77
|
+
}
|
|
78
|
+
});
|
|
79
|
+
(0, test_1.test)('uses but does not close a caller-provided page when loading fails', async ({ playwright, browser, page }) => {
|
|
80
|
+
const initialContextCount = browser.contexts().length;
|
|
81
|
+
const workspace = new theia_workspace_1.TheiaWorkspace();
|
|
82
|
+
try {
|
|
83
|
+
await (0, test_1.expect)(theia_app_loader_1.TheiaAppLoader.load({ playwright, browser, page }, workspace, FailingNavigationTheiaApp))
|
|
84
|
+
.rejects.toThrow('Test navigation failure');
|
|
85
|
+
(0, test_1.expect)(page.isClosed()).toBe(false);
|
|
86
|
+
(0, test_1.expect)(browser.contexts()).toHaveLength(initialContextCount);
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
workspace.remove();
|
|
90
|
+
}
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
//# sourceMappingURL=theia-app-loader.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"theia-app-loader.test.js","sourceRoot":"","sources":["../../src/tests/theia-app-loader.test.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;AAEhF,2CAAgD;AAChD,0DAAqD;AACrD,4CAAwC;AACxC,wDAAoD;AAEpD,MAAM,YAAa,SAAQ,oBAAQ;IAEtB,0BAA0B;QAC/B,iEAAiE;QACjE,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CACJ;AAED,MAAM,yBAA0B,SAAQ,YAAY;IAEvC,cAAc;QACnB,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC;IAChE,CAAC;CACJ;AAED,MAAM,8BAA+B,SAAQ,gCAAc;IAE9C,UAAU;QACf,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;IAC7D,CAAC;CACJ;AAED,WAAI,CAAC,QAAQ,CAAC,uCAAuC,EAAE,GAAG,EAAE;IACxD,WAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE,2CAA2C,CAAC,CAAC;IAE5F,IAAA,WAAI,EAAC,2DAA2D,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;QAChG,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtD,MAAM,GAAG,GAAG,MAAM,iCAAc,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;QAExF,IAAI,CAAC;YACD,IAAA,aAAM,EAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACxC,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,GAAG,CAAC,CAAC,CAAC;QACrE,CAAC;gBAAS,CAAC;YACP,MAAM,GAAG,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACvB,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC;QAC3B,CAAC;QAED,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;IACjE,CAAC,CAAC,CAAC;IAEH,IAAA,WAAI,EAAC,0EAA0E,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;QAC/G,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QAEtD,KAAK,IAAI,OAAO,GAAG,CAAC,EAAE,OAAO,GAAG,CAAC,EAAE,OAAO,EAAE,EAAE,CAAC;YAC3C,MAAM,SAAS,GAAG,IAAI,8BAA8B,EAAE,CAAC;YACvD,IAAI,CAAC;gBACD,MAAM,IAAA,aAAM,EAAC,iCAAc,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC;qBAC9E,OAAO,CAAC,OAAO,CAAC,uCAAuC,CAAC,CAAC;gBAC9D,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;YACjE,CAAC;oBAAS,CAAC;gBACP,SAAS,CAAC,MAAM,EAAE,CAAC;YACvB,CAAC;QACL,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAA,WAAI,EAAC,2DAA2D,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;QAChG,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,gCAAc,EAAE,CAAC;QAEvC,IAAI,CAAC;YACD,MAAM,IAAA,aAAM,EAAC,iCAAc,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,yBAAyB,CAAC,CAAC;iBAC3F,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;YAChD,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QACjE,CAAC;gBAAS,CAAC;YACP,SAAS,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAA,WAAI,EAAC,mEAAmE,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE;QAC9G,MAAM,mBAAmB,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC;QACtD,MAAM,SAAS,GAAG,IAAI,gCAAc,EAAE,CAAC;QAEvC,IAAI,CAAC;YACD,MAAM,IAAA,aAAM,EAAC,iCAAc,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,SAAS,EAAE,yBAAyB,CAAC,CAAC;iBACjG,OAAO,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;YAChD,IAAA,aAAM,EAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACpC,IAAA,aAAM,EAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,YAAY,CAAC,mBAAmB,CAAC,CAAC;QACjE,CAAC;gBAAS,CAAC;YACP,SAAS,CAAC,MAAM,EAAE,CAAC;QACvB,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
|
|
@@ -14,7 +14,21 @@ export interface TheiaPlaywrightTestConfig {
|
|
|
14
14
|
launchOptions?: object;
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
|
+
export interface TheiaAppLoaderArgs extends TheiaPlaywrightTestConfig, PlaywrightWorkerArgs {
|
|
18
|
+
/**
|
|
19
|
+
* A caller-owned page to use when loading a browser application.
|
|
20
|
+
* The loader never closes a supplied page, including when loading fails.
|
|
21
|
+
*/
|
|
22
|
+
page?: Page;
|
|
23
|
+
}
|
|
17
24
|
export declare namespace TheiaAppLoader {
|
|
18
|
-
|
|
25
|
+
/**
|
|
26
|
+
* Loads a Theia application.
|
|
27
|
+
*
|
|
28
|
+
* In browser mode, the loader creates a page when none is supplied. If loading succeeds,
|
|
29
|
+
* the caller owns that page and must close `app.page`. If loading fails, the loader closes
|
|
30
|
+
* only pages it created itself.
|
|
31
|
+
*/
|
|
32
|
+
function load<T extends TheiaApp>(args: TheiaAppLoaderArgs, initialWorkspace?: TheiaWorkspace, factory?: TheiaAppFactory<T>): Promise<T>;
|
|
19
33
|
}
|
|
20
34
|
//# sourceMappingURL=theia-app-loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-app-loader.d.ts","sourceRoot":"","sources":["../src/theia-app-loader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAyB,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,QAAQ;IAC/C,KAAI,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC;CAC9E;AAGD,MAAM,WAAW,yBAAyB;IACtC,WAAW,CAAC,EAAE;QACV,qFAAqF;QACrF,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gGAAgG;QAChG,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB,oMAAoM;QACpM,aAAa,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAA;CACJ;AA8GD,yBAAiB,cAAc,CAAC;IAE5B,SAAsB,IAAI,CAAC,CAAC,SAAS,QAAQ,EACzC,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"theia-app-loader.d.ts","sourceRoot":"","sources":["../src/theia-app-loader.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,IAAI,EAAE,oBAAoB,EAAyB,MAAM,kBAAkB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,MAAM,WAAW,eAAe,CAAC,CAAC,SAAS,QAAQ;IAC/C,KAAI,IAAI,EAAE,IAAI,EAAE,gBAAgB,EAAE,cAAc,EAAE,UAAU,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC;CAC9E;AAGD,MAAM,WAAW,yBAAyB;IACtC,WAAW,CAAC,EAAE;QACV,qFAAqF;QACrF,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,gGAAgG;QAChG,WAAW,CAAC,EAAE,MAAM,CAAC;QAErB,oMAAoM;QACpM,aAAa,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAA;CACJ;AAED,MAAM,WAAW,kBAAmB,SAAQ,yBAAyB,EAAE,oBAAoB;IACvF;;;OAGG;IACH,IAAI,CAAC,EAAE,IAAI,CAAC;CACf;AA8GD,yBAAiB,cAAc,CAAC;IAE5B;;;;;;OAMG;IACH,SAAsB,IAAI,CAAC,CAAC,SAAS,QAAQ,EACzC,IAAI,EAAE,kBAAkB,EACxB,gBAAgB,CAAC,EAAE,cAAc,EACjC,OAAO,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAC7B,OAAO,CAAC,CAAC,CAAC,CAsBZ;CACJ"}
|
package/lib/theia-app-loader.js
CHANGED
|
@@ -107,6 +107,13 @@ var TheiaElectronAppLoader;
|
|
|
107
107
|
})(TheiaElectronAppLoader || (TheiaElectronAppLoader = {}));
|
|
108
108
|
var TheiaAppLoader;
|
|
109
109
|
(function (TheiaAppLoader) {
|
|
110
|
+
/**
|
|
111
|
+
* Loads a Theia application.
|
|
112
|
+
*
|
|
113
|
+
* In browser mode, the loader creates a page when none is supplied. If loading succeeds,
|
|
114
|
+
* the caller owns that page and must close `app.page`. If loading fails, the loader closes
|
|
115
|
+
* only pages it created itself.
|
|
116
|
+
*/
|
|
110
117
|
async function load(args, initialWorkspace, factory) {
|
|
111
118
|
if (process.env.USE_ELECTRON === 'true') {
|
|
112
119
|
// disable native elements and early window to avoid issues with the electron app
|
|
@@ -115,8 +122,22 @@ var TheiaAppLoader;
|
|
|
115
122
|
process.env.THEIA_NO_SPLASH = 'true';
|
|
116
123
|
return TheiaElectronAppLoader.load(args, initialWorkspace, factory);
|
|
117
124
|
}
|
|
118
|
-
const
|
|
119
|
-
|
|
125
|
+
const ownsPage = args.page === undefined;
|
|
126
|
+
const page = args.page ?? await args.browser.newPage();
|
|
127
|
+
try {
|
|
128
|
+
return await TheiaBrowserAppLoader.load(page, initialWorkspace, factory);
|
|
129
|
+
}
|
|
130
|
+
catch (error) {
|
|
131
|
+
if (ownsPage) {
|
|
132
|
+
try {
|
|
133
|
+
await page.close();
|
|
134
|
+
}
|
|
135
|
+
catch (closeError) {
|
|
136
|
+
console.error('Failed to close the page after loading the Theia application failed.', closeError);
|
|
137
|
+
}
|
|
138
|
+
}
|
|
139
|
+
throw error;
|
|
140
|
+
}
|
|
120
141
|
}
|
|
121
142
|
TheiaAppLoader.load = load;
|
|
122
143
|
})(TheiaAppLoader || (exports.TheiaAppLoader = TheiaAppLoader = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-app-loader.js","sourceRoot":"","sources":["../src/theia-app-loader.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,oDAAoD;AACpD,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAEhF,2CAAqF;AACrF,2CAAuC;AACvC,uDAAmD;
|
|
1
|
+
{"version":3,"file":"theia-app-loader.js","sourceRoot":"","sources":["../src/theia-app-loader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/playwright",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.78.0-next.0+b0e3080cb",
|
|
4
4
|
"description": "System tests for Theia",
|
|
5
5
|
"license": "EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -37,7 +37,7 @@
|
|
|
37
37
|
"tslib": "^2.8.1"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
|
-
"@theia/cli": "1.
|
|
40
|
+
"@theia/cli": "1.78.0-next.0+b0e3080cb",
|
|
41
41
|
"@types/fs-extra": "^9.0.13",
|
|
42
42
|
"allure-commandline": "^2.46.1",
|
|
43
43
|
"allure-playwright": "^2.15.1",
|
|
@@ -49,5 +49,5 @@
|
|
|
49
49
|
"access": "public"
|
|
50
50
|
},
|
|
51
51
|
"main": "lib/index",
|
|
52
|
-
"gitHead": "
|
|
52
|
+
"gitHead": "b0e3080cb1b1fff5616555f1bf679834129da171"
|
|
53
53
|
}
|
|
@@ -0,0 +1,103 @@
|
|
|
1
|
+
// *****************************************************************************
|
|
2
|
+
// Copyright (C) 2026 EclipseSource and others.
|
|
3
|
+
//
|
|
4
|
+
// This program and the accompanying materials are made available under the
|
|
5
|
+
// terms of the Eclipse Public License v. 2.0 which is available at
|
|
6
|
+
// http://www.eclipse.org/legal/epl-2.0.
|
|
7
|
+
//
|
|
8
|
+
// This Source Code may also be made available under the following Secondary
|
|
9
|
+
// Licenses when the conditions for such availability set forth in the Eclipse
|
|
10
|
+
// Public License v. 2.0 are satisfied: GNU General Public License, version 2
|
|
11
|
+
// with the GNU Classpath Exception which is available at
|
|
12
|
+
// https://www.gnu.org/software/classpath/license.html.
|
|
13
|
+
//
|
|
14
|
+
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
|
+
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { expect, test } from '@playwright/test';
|
|
18
|
+
import { TheiaAppLoader } from '../theia-app-loader';
|
|
19
|
+
import { TheiaApp } from '../theia-app';
|
|
20
|
+
import { TheiaWorkspace } from '../theia-workspace';
|
|
21
|
+
|
|
22
|
+
class FastTheiaApp extends TheiaApp {
|
|
23
|
+
|
|
24
|
+
override waitForShellAndInitialized(): Promise<void> {
|
|
25
|
+
// Loading the document is sufficient for loader lifecycle tests.
|
|
26
|
+
return Promise.resolve();
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
class FailingNavigationTheiaApp extends FastTheiaApp {
|
|
31
|
+
|
|
32
|
+
override isShellVisible(): Promise<boolean> {
|
|
33
|
+
return Promise.reject(new Error('Test navigation failure'));
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
|
|
37
|
+
class FailingInitializationWorkspace extends TheiaWorkspace {
|
|
38
|
+
|
|
39
|
+
override initialize(): void {
|
|
40
|
+
throw new Error('Test workspace initialization failure');
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
test.describe('TheiaAppLoader browser page lifecycle', () => {
|
|
45
|
+
test.skip(process.env.USE_ELECTRON === 'true', 'These tests cover browser page ownership.');
|
|
46
|
+
|
|
47
|
+
test('keeps a loader-created page open after successful loading', async ({ playwright, browser }) => {
|
|
48
|
+
const initialContextCount = browser.contexts().length;
|
|
49
|
+
const app = await TheiaAppLoader.load({ playwright, browser }, undefined, FastTheiaApp);
|
|
50
|
+
|
|
51
|
+
try {
|
|
52
|
+
expect(app.page.isClosed()).toBe(false);
|
|
53
|
+
expect(browser.contexts()).toHaveLength(initialContextCount + 1);
|
|
54
|
+
} finally {
|
|
55
|
+
await app.page.close();
|
|
56
|
+
app.workspace.remove();
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
expect(browser.contexts()).toHaveLength(initialContextCount);
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
test('cleans up loader-created contexts after repeated initialization failures', async ({ playwright, browser }) => {
|
|
63
|
+
const initialContextCount = browser.contexts().length;
|
|
64
|
+
|
|
65
|
+
for (let attempt = 0; attempt < 3; attempt++) {
|
|
66
|
+
const workspace = new FailingInitializationWorkspace();
|
|
67
|
+
try {
|
|
68
|
+
await expect(TheiaAppLoader.load({ playwright, browser }, workspace, FastTheiaApp))
|
|
69
|
+
.rejects.toThrow('Test workspace initialization failure');
|
|
70
|
+
expect(browser.contexts()).toHaveLength(initialContextCount);
|
|
71
|
+
} finally {
|
|
72
|
+
workspace.remove();
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
test('cleans up a loader-created context after navigation fails', async ({ playwright, browser }) => {
|
|
78
|
+
const initialContextCount = browser.contexts().length;
|
|
79
|
+
const workspace = new TheiaWorkspace();
|
|
80
|
+
|
|
81
|
+
try {
|
|
82
|
+
await expect(TheiaAppLoader.load({ playwright, browser }, workspace, FailingNavigationTheiaApp))
|
|
83
|
+
.rejects.toThrow('Test navigation failure');
|
|
84
|
+
expect(browser.contexts()).toHaveLength(initialContextCount);
|
|
85
|
+
} finally {
|
|
86
|
+
workspace.remove();
|
|
87
|
+
}
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test('uses but does not close a caller-provided page when loading fails', async ({ playwright, browser, page }) => {
|
|
91
|
+
const initialContextCount = browser.contexts().length;
|
|
92
|
+
const workspace = new TheiaWorkspace();
|
|
93
|
+
|
|
94
|
+
try {
|
|
95
|
+
await expect(TheiaAppLoader.load({ playwright, browser, page }, workspace, FailingNavigationTheiaApp))
|
|
96
|
+
.rejects.toThrow('Test navigation failure');
|
|
97
|
+
expect(page.isClosed()).toBe(false);
|
|
98
|
+
expect(browser.contexts()).toHaveLength(initialContextCount);
|
|
99
|
+
} finally {
|
|
100
|
+
workspace.remove();
|
|
101
|
+
}
|
|
102
|
+
});
|
|
103
|
+
});
|
package/src/theia-app-loader.ts
CHANGED
|
@@ -35,6 +35,14 @@ export interface TheiaPlaywrightTestConfig {
|
|
|
35
35
|
}
|
|
36
36
|
}
|
|
37
37
|
|
|
38
|
+
export interface TheiaAppLoaderArgs extends TheiaPlaywrightTestConfig, PlaywrightWorkerArgs {
|
|
39
|
+
/**
|
|
40
|
+
* A caller-owned page to use when loading a browser application.
|
|
41
|
+
* The loader never closes a supplied page, including when loading fails.
|
|
42
|
+
*/
|
|
43
|
+
page?: Page;
|
|
44
|
+
}
|
|
45
|
+
|
|
38
46
|
function theiaAppFactory<T extends TheiaApp>(factory?: TheiaAppFactory<T>): TheiaAppFactory<T> {
|
|
39
47
|
return (factory ?? TheiaApp) as TheiaAppFactory<T>;
|
|
40
48
|
}
|
|
@@ -145,8 +153,15 @@ namespace TheiaElectronAppLoader {
|
|
|
145
153
|
|
|
146
154
|
export namespace TheiaAppLoader {
|
|
147
155
|
|
|
156
|
+
/**
|
|
157
|
+
* Loads a Theia application.
|
|
158
|
+
*
|
|
159
|
+
* In browser mode, the loader creates a page when none is supplied. If loading succeeds,
|
|
160
|
+
* the caller owns that page and must close `app.page`. If loading fails, the loader closes
|
|
161
|
+
* only pages it created itself.
|
|
162
|
+
*/
|
|
148
163
|
export async function load<T extends TheiaApp>(
|
|
149
|
-
args:
|
|
164
|
+
args: TheiaAppLoaderArgs,
|
|
150
165
|
initialWorkspace?: TheiaWorkspace,
|
|
151
166
|
factory?: TheiaAppFactory<T>,
|
|
152
167
|
): Promise<T> {
|
|
@@ -157,7 +172,19 @@ export namespace TheiaAppLoader {
|
|
|
157
172
|
process.env.THEIA_NO_SPLASH = 'true';
|
|
158
173
|
return TheiaElectronAppLoader.load(args, initialWorkspace, factory);
|
|
159
174
|
}
|
|
160
|
-
const
|
|
161
|
-
|
|
175
|
+
const ownsPage = args.page === undefined;
|
|
176
|
+
const page = args.page ?? await args.browser.newPage();
|
|
177
|
+
try {
|
|
178
|
+
return await TheiaBrowserAppLoader.load(page, initialWorkspace, factory);
|
|
179
|
+
} catch (error) {
|
|
180
|
+
if (ownsPage) {
|
|
181
|
+
try {
|
|
182
|
+
await page.close();
|
|
183
|
+
} catch (closeError) {
|
|
184
|
+
console.error('Failed to close the page after loading the Theia application failed.', closeError);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
throw error;
|
|
188
|
+
}
|
|
162
189
|
}
|
|
163
190
|
}
|