@theia/playwright 1.28.0-next.7 → 1.28.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-main-menu.test.js +1 -1
- package/lib/tests/theia-main-menu.test.js.map +1 -1
- package/lib/theia-menu-item.d.ts +1 -0
- package/lib/theia-menu-item.d.ts.map +1 -1
- package/lib/theia-menu-item.js +13 -1
- package/lib/theia-menu-item.js.map +1 -1
- package/package.json +2 -2
- package/src/tests/theia-main-menu.test.ts +1 -1
- package/src/theia-menu-item.ts +15 -2
|
@@ -48,7 +48,7 @@ theia_fixture_1.default.describe('Theia Main Menu', () => {
|
|
|
48
48
|
const label = await (menuItem === null || menuItem === void 0 ? void 0 : menuItem.label());
|
|
49
49
|
(0, test_1.expect)(label).toBe('New File');
|
|
50
50
|
const shortCut = await (menuItem === null || menuItem === void 0 ? void 0 : menuItem.shortCut());
|
|
51
|
-
(0, test_1.expect)(shortCut).toBe(util_1.OSUtil.isMacOS ? 'N' : 'Alt+N');
|
|
51
|
+
(0, test_1.expect)(shortCut).toBe(util_1.OSUtil.isMacOS ? '⌥ N' : 'Alt+N');
|
|
52
52
|
const hasSubmenu = await (menuItem === null || menuItem === void 0 ? void 0 : menuItem.hasSubmenu());
|
|
53
53
|
(0, test_1.expect)(hasSubmenu).toBe(false);
|
|
54
54
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-main-menu.test.js","sourceRoot":"","sources":["../../src/tests/theia-main-menu.test.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+DAA+D;AAC/D,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;AAEhF,2CAA0C;AAC1C,kCAAiC;AACjC,4CAAwC;AAExC,4DAAsD;AAEtD,IAAI,OAAqB,CAAC;AAE1B,uBAAI,CAAC,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAElC,uBAAI,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE;QACtB,MAAM,GAAG,GAAG,MAAM,oBAAQ,CAAC,IAAI,CAAC,oBAAI,CAAC,CAAC;QACtC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;IAC1B,CAAC,CAAC,CAAC;IAEH,IAAA,uBAAI,EAAC,+BAA+B,EAAE,KAAK,IAAI,EAAE;QAC7C,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,mBAAmB,EAAE,CAAC;QACzD,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACvC,IAAA,aAAM,EAAC,YAAY,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,IAAA,uBAAI,EAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;QAC5C,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChD,IAAA,aAAM,EAAC,MAAM,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAC;IAEH,IAAA,uBAAI,EAAC,wDAAwD,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,gBAAgB,EAAE,CAAC;QACpD,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QACxC,IAAA,aAAM,EAAC,SAAS,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;IAC9C,CAAC,CAAC,CAAC;IAEH,IAAA,uBAAI,EAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC;QAE/B,MAAM,KAAK,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,KAAK,EAAE,CAAA,CAAC;QACtC,IAAA,aAAM,EAAC,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE/B,MAAM,QAAQ,GAAG,MAAM,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,QAAQ,EAAE,CAAA,CAAC;QAC5C,IAAA,aAAM,EAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,aAAM,CAAC,OAAO,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"theia-main-menu.test.js","sourceRoot":"","sources":["../../src/tests/theia-main-menu.test.ts"],"names":[],"mappings":"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"}
|
package/lib/theia-menu-item.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export declare class TheiaMenuItem {
|
|
|
4
4
|
constructor(element: ElementHandle<SVGElement | HTMLElement>);
|
|
5
5
|
protected labelElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement>>;
|
|
6
6
|
protected shortCutElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement>>;
|
|
7
|
+
protected isHidden(): Promise<boolean>;
|
|
7
8
|
label(): Promise<string | undefined>;
|
|
8
9
|
shortCut(): Promise<string | undefined>;
|
|
9
10
|
hasSubmenu(): Promise<boolean>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-menu-item.d.ts","sourceRoot":"","sources":["../src/theia-menu-item.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,aAAa;IAEV,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC;gBAAhD,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC;IAEtE,SAAS,CAAC,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC;IAIhF,SAAS,CAAC,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"theia-menu-item.d.ts","sourceRoot":"","sources":["../src/theia-menu-item.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAIjD,qBAAa,aAAa;IAEV,SAAS,CAAC,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC;gBAAhD,OAAO,EAAE,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC;IAEtE,SAAS,CAAC,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC;IAIhF,SAAS,CAAC,qBAAqB,IAAI,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC;IAInF,SAAS,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAIhC,KAAK,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOpC,QAAQ,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAOvC,UAAU,IAAI,OAAO,CAAC,OAAO,CAAC;IAO9B,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAQ7B,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAKtB,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;CAI/B"}
|
package/lib/theia-menu-item.js
CHANGED
|
@@ -27,13 +27,25 @@ class TheiaMenuItem {
|
|
|
27
27
|
shortCutElementHandle() {
|
|
28
28
|
return this.element.waitForSelector('.p-Menu-itemShortcut');
|
|
29
29
|
}
|
|
30
|
+
isHidden() {
|
|
31
|
+
return (0, util_1.elementContainsClass)(this.element, 'p-mod-collapsed');
|
|
32
|
+
}
|
|
30
33
|
async label() {
|
|
34
|
+
if (await this.isHidden()) {
|
|
35
|
+
return undefined;
|
|
36
|
+
}
|
|
31
37
|
return (0, util_1.textContent)(this.labelElementHandle());
|
|
32
38
|
}
|
|
33
39
|
async shortCut() {
|
|
40
|
+
if (await this.isHidden()) {
|
|
41
|
+
return undefined;
|
|
42
|
+
}
|
|
34
43
|
return (0, util_1.textContent)(this.shortCutElementHandle());
|
|
35
44
|
}
|
|
36
45
|
async hasSubmenu() {
|
|
46
|
+
if (await this.isHidden()) {
|
|
47
|
+
return false;
|
|
48
|
+
}
|
|
37
49
|
return (await this.element.getAttribute('data-type')) === 'submenu';
|
|
38
50
|
}
|
|
39
51
|
async isEnabled() {
|
|
@@ -41,7 +53,7 @@ class TheiaMenuItem {
|
|
|
41
53
|
if (classAttribute === undefined || classAttribute === null) {
|
|
42
54
|
return false;
|
|
43
55
|
}
|
|
44
|
-
return !classAttribute.includes('p-mod-disabled');
|
|
56
|
+
return !classAttribute.includes('p-mod-disabled') && !classAttribute.includes('p-mod-collapsed');
|
|
45
57
|
}
|
|
46
58
|
async click() {
|
|
47
59
|
return this.element.waitForSelector('.p-Menu-itemLabel')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"theia-menu-item.js","sourceRoot":"","sources":["../src/theia-menu-item.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+DAA+D;AAC/D,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAIhF,
|
|
1
|
+
{"version":3,"file":"theia-menu-item.js","sourceRoot":"","sources":["../src/theia-menu-item.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+DAA+D;AAC/D,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAIhF,iCAA2D;AAE3D,MAAa,aAAa;IAEtB,YAAsB,OAAgD;QAAhD,YAAO,GAAP,OAAO,CAAyC;IAAI,CAAC;IAEjE,kBAAkB;QACxB,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC,CAAC;IAC7D,CAAC;IAES,qBAAqB;QAC3B,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,sBAAsB,CAAC,CAAC;IAChE,CAAC;IAES,QAAQ;QACd,OAAO,IAAA,2BAAoB,EAAC,IAAI,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAED,KAAK,CAAC,KAAK;QACP,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,EAAE;YACvB,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,IAAA,kBAAW,EAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,QAAQ;QACV,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,EAAE;YACvB,OAAO,SAAS,CAAC;SACpB;QACD,OAAO,IAAA,kBAAW,EAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;IACrD,CAAC;IAED,KAAK,CAAC,UAAU;QACZ,IAAI,MAAM,IAAI,CAAC,QAAQ,EAAE,EAAE;YACvB,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,KAAK,SAAS,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,cAAc,GAAG,CAAC,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC;QAClE,IAAI,cAAc,KAAK,SAAS,IAAI,cAAc,KAAK,IAAI,EAAE;YACzD,OAAO,KAAK,CAAC;SAChB;QACD,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC;IACrG,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,mBAAmB,CAAC;aACnD,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,KAAK,CAAC,KAAK;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;CAEJ;AAtDD,sCAsDC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/playwright",
|
|
3
|
-
"version": "1.28.0
|
|
3
|
+
"version": "1.28.0",
|
|
4
4
|
"description": "System tests for Theia",
|
|
5
5
|
"license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
|
|
6
6
|
"repository": {
|
|
@@ -41,5 +41,5 @@
|
|
|
41
41
|
"access": "public"
|
|
42
42
|
},
|
|
43
43
|
"main": "lib/index",
|
|
44
|
-
"gitHead": "
|
|
44
|
+
"gitHead": "79d58c87a7bd76f435000a2ac59803b04e1c78be"
|
|
45
45
|
}
|
|
@@ -57,7 +57,7 @@ test.describe('Theia Main Menu', () => {
|
|
|
57
57
|
expect(label).toBe('New File');
|
|
58
58
|
|
|
59
59
|
const shortCut = await menuItem?.shortCut();
|
|
60
|
-
expect(shortCut).toBe(OSUtil.isMacOS ? 'N' : 'Alt+N');
|
|
60
|
+
expect(shortCut).toBe(OSUtil.isMacOS ? '⌥ N' : 'Alt+N');
|
|
61
61
|
|
|
62
62
|
const hasSubmenu = await menuItem?.hasSubmenu();
|
|
63
63
|
expect(hasSubmenu).toBe(false);
|
package/src/theia-menu-item.ts
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
import { ElementHandle } from '@playwright/test';
|
|
18
18
|
|
|
19
|
-
import { textContent } from './util';
|
|
19
|
+
import { elementContainsClass, textContent } from './util';
|
|
20
20
|
|
|
21
21
|
export class TheiaMenuItem {
|
|
22
22
|
|
|
@@ -30,15 +30,28 @@ export class TheiaMenuItem {
|
|
|
30
30
|
return this.element.waitForSelector('.p-Menu-itemShortcut');
|
|
31
31
|
}
|
|
32
32
|
|
|
33
|
+
protected isHidden(): Promise<boolean> {
|
|
34
|
+
return elementContainsClass(this.element, 'p-mod-collapsed');
|
|
35
|
+
}
|
|
36
|
+
|
|
33
37
|
async label(): Promise<string | undefined> {
|
|
38
|
+
if (await this.isHidden()) {
|
|
39
|
+
return undefined;
|
|
40
|
+
}
|
|
34
41
|
return textContent(this.labelElementHandle());
|
|
35
42
|
}
|
|
36
43
|
|
|
37
44
|
async shortCut(): Promise<string | undefined> {
|
|
45
|
+
if (await this.isHidden()) {
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
38
48
|
return textContent(this.shortCutElementHandle());
|
|
39
49
|
}
|
|
40
50
|
|
|
41
51
|
async hasSubmenu(): Promise<boolean> {
|
|
52
|
+
if (await this.isHidden()) {
|
|
53
|
+
return false;
|
|
54
|
+
}
|
|
42
55
|
return (await this.element.getAttribute('data-type')) === 'submenu';
|
|
43
56
|
}
|
|
44
57
|
|
|
@@ -47,7 +60,7 @@ export class TheiaMenuItem {
|
|
|
47
60
|
if (classAttribute === undefined || classAttribute === null) {
|
|
48
61
|
return false;
|
|
49
62
|
}
|
|
50
|
-
return !classAttribute.includes('p-mod-disabled');
|
|
63
|
+
return !classAttribute.includes('p-mod-disabled') && !classAttribute.includes('p-mod-collapsed');
|
|
51
64
|
}
|
|
52
65
|
|
|
53
66
|
async click(): Promise<void> {
|