@theia/playwright 1.26.0-next.22 → 1.26.0-next.25

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.
Files changed (21) hide show
  1. package/lib/theia-notification-indicator.d.ts +1 -2
  2. package/lib/theia-notification-indicator.d.ts.map +1 -1
  3. package/lib/theia-notification-indicator.js +11 -11
  4. package/lib/theia-notification-indicator.js.map +1 -1
  5. package/lib/theia-problem-indicator.d.ts +1 -1
  6. package/lib/theia-problem-indicator.d.ts.map +1 -1
  7. package/lib/theia-problem-indicator.js +4 -5
  8. package/lib/theia-problem-indicator.js.map +1 -1
  9. package/lib/theia-status-indicator.d.ts +7 -11
  10. package/lib/theia-status-indicator.d.ts.map +1 -1
  11. package/lib/theia-status-indicator.js +13 -41
  12. package/lib/theia-status-indicator.js.map +1 -1
  13. package/lib/theia-toggle-bottom-indicator.d.ts +1 -1
  14. package/lib/theia-toggle-bottom-indicator.d.ts.map +1 -1
  15. package/lib/theia-toggle-bottom-indicator.js +3 -3
  16. package/lib/theia-toggle-bottom-indicator.js.map +1 -1
  17. package/package.json +2 -2
  18. package/src/theia-notification-indicator.ts +9 -14
  19. package/src/theia-problem-indicator.ts +2 -9
  20. package/src/theia-status-indicator.ts +15 -44
  21. package/src/theia-toggle-bottom-indicator.ts +1 -5
package/lib/theia-notification-indicator.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import { TheiaStatusIndicator } from './theia-status-indicator';
2
2
  export declare class TheiaNotificationIndicator extends TheiaStatusIndicator {
3
- protected get title(): string;
4
- isVisible(): Promise<boolean>;
3
+ id: string;
5
4
  hasNotifications(): Promise<boolean>;
6
5
  waitForVisible(expectNotifications?: boolean): Promise<void>;
7
6
  toggleOverlay(): Promise<void>;
package/lib/theia-notification-indicator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-notification-indicator.d.ts","sourceRoot":"","sources":["../src/theia-notification-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAMhE,qBAAa,0BAA2B,SAAQ,oBAAoB;IAEhE,SAAS,KAAK,KAAK,IAAI,MAAM,CAE5B;IAEc,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAItC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAI3B,cAAc,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAInE,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAQvC"}
1
+ {"version":3,"file":"theia-notification-indicator.d.ts","sourceRoot":"","sources":["../src/theia-notification-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAIhE,qBAAa,0BAA2B,SAAQ,oBAAoB;IAChE,EAAE,SAA+B;IAE3B,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAM3B,cAAc,CAAC,mBAAmB,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnE,aAAa,IAAI,OAAO,CAAC,IAAI,CAAC;CAOvC"}
package/lib/theia-notification-indicator.js CHANGED
@@ -17,25 +17,25 @@
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.TheiaNotificationIndicator = void 0;
19
19
  const theia_status_indicator_1 = require("./theia-status-indicator");
20
- const NOTIFICATION_ICON = 'codicon-bell';
21
20
  const NOTIFICATION_DOT_ICON = 'codicon-bell-dot';
22
- const NOTIFICATION_ICONS = [NOTIFICATION_ICON, NOTIFICATION_DOT_ICON];
23
21
  class TheiaNotificationIndicator extends theia_status_indicator_1.TheiaStatusIndicator {
24
- get title() {
25
- return 'Notification';
26
- }
27
- async isVisible() {
28
- return super.isVisible(NOTIFICATION_ICONS, this.title);
22
+ constructor() {
23
+ super(...arguments);
24
+ this.id = 'theia-notification-center';
29
25
  }
30
26
  async hasNotifications() {
31
- return super.isVisible(NOTIFICATION_DOT_ICON, this.title);
27
+ const container = await this.getElementHandle();
28
+ const bellWithDot = await container.$(`.${NOTIFICATION_DOT_ICON}`);
29
+ return Boolean(bellWithDot === null || bellWithDot === void 0 ? void 0 : bellWithDot.isVisible());
32
30
  }
33
31
  async waitForVisible(expectNotifications = false) {
34
- await super.waitForVisibleByIcon(expectNotifications ? NOTIFICATION_DOT_ICON : NOTIFICATION_ICON);
32
+ await super.waitForVisible();
33
+ if (expectNotifications && !(await this.hasNotifications())) {
34
+ throw new Error('No notifications when notifications expected.');
35
+ }
35
36
  }
36
37
  async toggleOverlay() {
37
- const hasNotifications = await this.hasNotifications();
38
- const element = await this.getElementHandleByIcon(hasNotifications ? NOTIFICATION_DOT_ICON : NOTIFICATION_ICON, this.title);
38
+ const element = await this.getElementHandle();
39
39
  if (element) {
40
40
  await element.click();
41
41
  }
package/lib/theia-notification-indicator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-notification-indicator.js","sourceRoot":"","sources":["../src/theia-notification-indicator.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,qEAAgE;AAEhE,MAAM,iBAAiB,GAAG,cAAc,CAAC;AACzC,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AACjD,MAAM,kBAAkB,GAAG,CAAC,iBAAiB,EAAE,qBAAqB,CAAC,CAAC;AAEtE,MAAa,0BAA2B,SAAQ,6CAAoB;IAEhE,IAAc,KAAK;QACf,OAAO,cAAc,CAAC;IAC1B,CAAC;IAEQ,KAAK,CAAC,SAAS;QACpB,OAAO,KAAK,CAAC,SAAS,CAAC,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,OAAO,KAAK,CAAC,SAAS,CAAC,qBAAqB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9D,CAAC;IAEQ,KAAK,CAAC,cAAc,CAAC,mBAAmB,GAAG,KAAK;QACrD,MAAM,KAAK,CAAC,oBAAoB,CAAC,mBAAmB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC;IACtG,CAAC;IAED,KAAK,CAAC,aAAa;QACf,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACvD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC5H,IAAI,OAAO,EAAE;YACT,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;SACzB;IACL,CAAC;CAEJ;AA1BD,gEA0BC"}
1
+ {"version":3,"file":"theia-notification-indicator.js","sourceRoot":"","sources":["../src/theia-notification-indicator.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,qEAAgE;AAEhE,MAAM,qBAAqB,GAAG,kBAAkB,CAAC;AAEjD,MAAa,0BAA2B,SAAQ,6CAAoB;IAApE;;QACI,OAAE,GAAG,2BAA2B,CAAC;IAsBrC,CAAC;IApBG,KAAK,CAAC,gBAAgB;QAClB,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAChD,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC,CAAC,CAAC,IAAI,qBAAqB,EAAE,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,SAAS,EAAE,CAAC,CAAC;IAC7C,CAAC;IAEQ,KAAK,CAAC,cAAc,CAAC,mBAAmB,GAAG,KAAK;QACrD,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;QAC7B,IAAI,mBAAmB,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE;YACzD,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;SACpE;IACL,CAAC;IAED,KAAK,CAAC,aAAa;QACf,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9C,IAAI,OAAO,EAAE;YACT,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;SACzB;IACL,CAAC;CAEJ;AAvBD,gEAuBC"}
package/lib/theia-problem-indicator.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import { ElementHandle } from '@playwright/test';
2
2
  import { TheiaStatusIndicator } from './theia-status-indicator';
3
3
  export declare class TheiaProblemIndicator extends TheiaStatusIndicator {
4
- isVisible(): Promise<boolean>;
4
+ id: string;
5
5
  numberOfProblems(): Promise<number>;
6
6
  numberOfWarnings(): Promise<number>;
7
7
  protected getSpans(): Promise<ElementHandle[] | undefined>;
package/lib/theia-problem-indicator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-problem-indicator.d.ts","sourceRoot":"","sources":["../src/theia-problem-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAIhE,qBAAa,qBAAsB,SAAQ,oBAAoB;IAE5C,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;IAKtC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKnC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;cAKzB,QAAQ,IAAI,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;CAKnE"}
1
+ {"version":3,"file":"theia-problem-indicator.d.ts","sourceRoot":"","sources":["../src/theia-problem-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBAAa,qBAAsB,SAAQ,oBAAoB;IAC3D,EAAE,SAA2B;IAEvB,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKnC,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC;cAKzB,QAAQ,IAAI,OAAO,CAAC,aAAa,EAAE,GAAG,SAAS,CAAC;CAInE"}
package/lib/theia-problem-indicator.js CHANGED
@@ -17,11 +17,10 @@
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.TheiaProblemIndicator = void 0;
19
19
  const theia_status_indicator_1 = require("./theia-status-indicator");
20
- const PROBLEM_ICON = 'codicon-error';
21
20
  class TheiaProblemIndicator extends theia_status_indicator_1.TheiaStatusIndicator {
22
- async isVisible() {
23
- const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
24
- return !!handle && handle.isVisible();
21
+ constructor() {
22
+ super(...arguments);
23
+ this.id = 'problem-marker-status';
25
24
  }
26
25
  async numberOfProblems() {
27
26
  const spans = await this.getSpans();
@@ -32,7 +31,7 @@ class TheiaProblemIndicator extends theia_status_indicator_1.TheiaStatusIndicato
32
31
  return spans ? +await spans[3].innerText() : -1;
33
32
  }
34
33
  async getSpans() {
35
- const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
34
+ const handle = await this.getElementHandle();
36
35
  return handle === null || handle === void 0 ? void 0 : handle.$$('span');
37
36
  }
38
37
  }
package/lib/theia-problem-indicator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-problem-indicator.js","sourceRoot":"","sources":["../src/theia-problem-indicator.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;;;AAGhF,qEAAgE;AAEhE,MAAM,YAAY,GAAG,eAAe,CAAC;AAErC,MAAa,qBAAsB,SAAQ,6CAAoB;IAElD,KAAK,CAAC,SAAS;QACpB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,SAAS,EAAE,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,QAAQ;QACpB,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,sBAAsB,CAAC,YAAY,CAAC,CAAC;QAChE,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;CAEJ;AAtBD,sDAsBC"}
1
+ {"version":3,"file":"theia-problem-indicator.js","sourceRoot":"","sources":["../src/theia-problem-indicator.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;;;AAGhF,qEAAgE;AAEhE,MAAa,qBAAsB,SAAQ,6CAAoB;IAA/D;;QACI,OAAE,GAAG,uBAAuB,CAAC;IAgBjC,CAAC;IAdG,KAAK,CAAC,gBAAgB;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpD,CAAC;IAES,KAAK,CAAC,QAAQ;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC7C,OAAO,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC;CACJ;AAjBD,sDAiBC"}
package/lib/theia-status-indicator.d.ts CHANGED
@@ -1,15 +1,11 @@
1
1
  import { ElementHandle } from '@playwright/test';
2
2
  import { TheiaPageObject } from './theia-page-object';
3
- export declare class TheiaStatusIndicator extends TheiaPageObject {
4
- protected elementSpanSelector: string;
5
- protected getElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
6
- waitForVisible(): Promise<void>;
7
- protected getSelectorByTitle(title: string): string;
8
- getElementHandleByTitle(title: string): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
9
- protected getSelectorByIcon(icon: string): string;
10
- getElementHandleByIcon(iconClass: string | string[], titleContain?: string): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
11
- waitForVisibleByTitle(title: string, waitForDetached?: boolean): Promise<void>;
12
- waitForVisibleByIcon(icon: string, waitForDetached?: boolean): Promise<void>;
13
- isVisible(icon: string | string[], titleContain?: string): Promise<boolean>;
3
+ export declare abstract class TheiaStatusIndicator extends TheiaPageObject {
4
+ protected abstract id: string;
5
+ protected statusBarElementSelector: string;
6
+ protected getSelectorForId(id: string): string;
7
+ waitForVisible(waitForDetached?: boolean): Promise<void>;
8
+ getElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement>>;
9
+ isVisible(): Promise<boolean>;
14
10
  }
15
11
  //# sourceMappingURL=theia-status-indicator.d.ts.map
package/lib/theia-status-indicator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-status-indicator.d.ts","sourceRoot":"","sources":["../src/theia-status-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,qBAAa,oBAAqB,SAAQ,eAAe;IAErD,SAAS,CAAC,mBAAmB,SAAoC;cAEjD,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;IAIrF,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAIrC,SAAS,CAAC,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM;IAI7C,uBAAuB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;IAKrG,SAAS,CAAC,iBAAiB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM;IAI3C,sBAAsB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,YAAY,SAAK,GAAG,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC;IAiBhI,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI5E,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,eAAe,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,YAAY,SAAK,GAAG,OAAO,CAAC,OAAO,CAAC;CAShF"}
1
+ {"version":3,"file":"theia-status-indicator.d.ts","sourceRoot":"","sources":["../src/theia-status-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,8BAAsB,oBAAqB,SAAQ,eAAe;IAC9D,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IAE9B,SAAS,CAAC,wBAAwB,SAAkC;IAEpE,SAAS,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAIxC,cAAc,CAAC,eAAe,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAItD,gBAAgB,IAAI,OAAO,CAAC,aAAa,CAAC,UAAU,GAAG,WAAW,CAAC,CAAC;IAQpE,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAStC"}
package/lib/theia-status-indicator.js CHANGED
@@ -20,53 +20,25 @@ const theia_page_object_1 = require("./theia-page-object");
20
20
  class TheiaStatusIndicator extends theia_page_object_1.TheiaPageObject {
21
21
  constructor() {
22
22
  super(...arguments);
23
- this.elementSpanSelector = '#theia-statusBar .element span';
23
+ this.statusBarElementSelector = '#theia-statusBar div.element';
24
24
  }
25
- async getElementHandle() {
26
- return this.page.$(this.elementSpanSelector);
27
- }
28
- async waitForVisible() {
29
- await this.page.waitForSelector(this.elementSpanSelector);
30
- }
31
- getSelectorByTitle(title) {
32
- return `.element[title="${title}"]`;
33
- }
34
- async getElementHandleByTitle(title) {
35
- // Fetch element via title in case status elements exist without a dedicated Codicon icon
36
- return this.page.$(this.getSelectorByTitle(title));
25
+ getSelectorForId(id) {
26
+ return `${this.statusBarElementSelector}#status-bar-${id}`;
37
27
  }
38
- getSelectorByIcon(icon) {
39
- return `${this.elementSpanSelector}.codicon.${icon}`;
28
+ async waitForVisible(waitForDetached = false) {
29
+ await this.page.waitForSelector(this.getSelectorForId(this.id), waitForDetached ? { state: 'detached' } : {});
40
30
  }
41
- async getElementHandleByIcon(iconClass, titleContain = '') {
42
- const icons = Array.isArray(iconClass) ? iconClass : [iconClass];
43
- for (const icon of icons) {
44
- const span = await this.page.$(this.getSelectorByIcon(icon));
45
- if (span) {
46
- const parent = await span.$('..');
47
- if (titleContain === '') {
48
- return parent;
49
- }
50
- else {
51
- const parentTitle = await (parent === null || parent === void 0 ? void 0 : parent.getAttribute('title'));
52
- if (parentTitle === null || parentTitle === void 0 ? void 0 : parentTitle.includes(titleContain)) {
53
- return parent;
54
- }
55
- }
56
- }
31
+ async getElementHandle() {
32
+ const element = await this.page.$(this.getSelectorForId(this.id));
33
+ if (element) {
34
+ return element;
57
35
  }
58
- throw new Error('Cannot find indicator');
59
- }
60
- async waitForVisibleByTitle(title, waitForDetached = false) {
61
- await this.page.waitForSelector(this.getSelectorByTitle(title), waitForDetached ? { state: 'detached' } : {});
62
- }
63
- async waitForVisibleByIcon(icon, waitForDetached = false) {
64
- await this.page.waitForSelector(this.getSelectorByIcon(icon), waitForDetached ? { state: 'detached' } : {});
36
+ throw new Error('Could not find status bar element with ID ' + this.id);
65
37
  }
66
- async isVisible(icon, titleContain = '') {
38
+ async isVisible() {
67
39
  try {
68
- const element = await this.getElementHandleByIcon(icon, titleContain);
69
- return !!element && element.isVisible();
40
+ const element = await this.getElementHandle();
41
+ return element.isVisible();
70
42
  }
71
43
  catch (err) {
72
44
  return false;
package/lib/theia-status-indicator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-status-indicator.js","sourceRoot":"","sources":["../src/theia-status-indicator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"theia-status-indicator.js","sourceRoot":"","sources":["../src/theia-status-indicator.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;;;AAGhF,2DAAsD;AAEtD,MAAsB,oBAAqB,SAAQ,mCAAe;IAAlE;;QAGc,6BAAwB,GAAG,8BAA8B,CAAC;IA2BxE,CAAC;IAzBa,gBAAgB,CAAC,EAAU;QACjC,OAAO,GAAG,IAAI,CAAC,wBAAwB,eAAe,EAAE,EAAE,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,eAAe,GAAG,KAAK;QACxC,MAAM,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAClH,CAAC;IAED,KAAK,CAAC,gBAAgB;QAClB,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;QAClE,IAAI,OAAO,EAAE;YACT,OAAO,OAAO,CAAC;SAClB;QACD,MAAM,IAAI,KAAK,CAAC,4CAA4C,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5E,CAAC;IAED,KAAK,CAAC,SAAS;QACX,IAAI;YACA,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC9C,OAAO,OAAO,CAAC,SAAS,EAAE,CAAC;SAC9B;QAAC,OAAO,GAAG,EAAE;YACV,OAAO,KAAK,CAAC;SAChB;IACL,CAAC;CAEJ;AA9BD,oDA8BC"}
package/lib/theia-toggle-bottom-indicator.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { TheiaStatusIndicator } from './theia-status-indicator';
2
2
  export declare class TheiaToggleBottomIndicator extends TheiaStatusIndicator {
3
- isVisible(): Promise<boolean>;
3
+ id: string;
4
4
  }
5
5
  //# sourceMappingURL=theia-toggle-bottom-indicator.d.ts.map
package/lib/theia-toggle-bottom-indicator.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-toggle-bottom-indicator.d.ts","sourceRoot":"","sources":["../src/theia-toggle-bottom-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAIhE,qBAAa,0BAA2B,SAAQ,oBAAoB;IACjD,SAAS,IAAI,OAAO,CAAC,OAAO,CAAC;CAG/C"}
1
+ {"version":3,"file":"theia-toggle-bottom-indicator.d.ts","sourceRoot":"","sources":["../src/theia-toggle-bottom-indicator.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAEhE,qBAAa,0BAA2B,SAAQ,oBAAoB;IAChE,EAAE,SAAyB;CAC9B"}
package/lib/theia-toggle-bottom-indicator.js CHANGED
@@ -17,10 +17,10 @@
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  exports.TheiaToggleBottomIndicator = void 0;
19
19
  const theia_status_indicator_1 = require("./theia-status-indicator");
20
- const TOGGLE_BOTTOM_ICON = 'codicon-window';
21
20
  class TheiaToggleBottomIndicator extends theia_status_indicator_1.TheiaStatusIndicator {
22
- async isVisible() {
23
- return super.isVisible(TOGGLE_BOTTOM_ICON);
21
+ constructor() {
22
+ super(...arguments);
23
+ this.id = 'bottom-panel-toggle';
24
24
  }
25
25
  }
26
26
  exports.TheiaToggleBottomIndicator = TheiaToggleBottomIndicator;
package/lib/theia-toggle-bottom-indicator.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theia-toggle-bottom-indicator.js","sourceRoot":"","sources":["../src/theia-toggle-bottom-indicator.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,qEAAgE;AAEhE,MAAM,kBAAkB,GAAG,gBAAgB,CAAC;AAE5C,MAAa,0BAA2B,SAAQ,6CAAoB;IACvD,KAAK,CAAC,SAAS;QACpB,OAAO,KAAK,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;IAC/C,CAAC;CACJ;AAJD,gEAIC"}
1
+ {"version":3,"file":"theia-toggle-bottom-indicator.js","sourceRoot":"","sources":["../src/theia-toggle-bottom-indicator.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,qEAAgE;AAEhE,MAAa,0BAA2B,SAAQ,6CAAoB;IAApE;;QACI,OAAE,GAAG,qBAAqB,CAAC;IAC/B,CAAC;CAAA;AAFD,gEAEC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@theia/playwright",
3
- "version": "1.26.0-next.22+1265154246d",
3
+ "version": "1.26.0-next.25+70466bb4b72",
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": "1265154246d98e44c0e1ee479aa9d42b2615d9d1"
44
+ "gitHead": "70466bb4b7283187b019defec095f8dea42d47c6"
45
45
  }
package/src/theia-notification-indicator.ts CHANGED
@@ -16,31 +16,26 @@
16
16
 
17
17
  import { TheiaStatusIndicator } from './theia-status-indicator';
18
18
 
19
- const NOTIFICATION_ICON = 'codicon-bell';
20
19
  const NOTIFICATION_DOT_ICON = 'codicon-bell-dot';
21
- const NOTIFICATION_ICONS = [NOTIFICATION_ICON, NOTIFICATION_DOT_ICON];
22
20
 
23
21
  export class TheiaNotificationIndicator extends TheiaStatusIndicator {
24
-
25
- protected get title(): string {
26
- return 'Notification';
27
- }
28
-
29
- override async isVisible(): Promise<boolean> {
30
- return super.isVisible(NOTIFICATION_ICONS, this.title);
31
- }
22
+ id = 'theia-notification-center';
32
23
 
33
24
  async hasNotifications(): Promise<boolean> {
34
- return super.isVisible(NOTIFICATION_DOT_ICON, this.title);
25
+ const container = await this.getElementHandle();
26
+ const bellWithDot = await container.$(`.${NOTIFICATION_DOT_ICON}`);
27
+ return Boolean(bellWithDot?.isVisible());
35
28
  }
36
29
 
37
30
  override async waitForVisible(expectNotifications = false): Promise<void> {
38
- await super.waitForVisibleByIcon(expectNotifications ? NOTIFICATION_DOT_ICON : NOTIFICATION_ICON);
31
+ await super.waitForVisible();
32
+ if (expectNotifications && !(await this.hasNotifications())) {
33
+ throw new Error('No notifications when notifications expected.');
34
+ }
39
35
  }
40
36
 
41
37
  async toggleOverlay(): Promise<void> {
42
- const hasNotifications = await this.hasNotifications();
43
- const element = await this.getElementHandleByIcon(hasNotifications ? NOTIFICATION_DOT_ICON : NOTIFICATION_ICON, this.title);
38
+ const element = await this.getElementHandle();
44
39
  if (element) {
45
40
  await element.click();
46
41
  }
package/src/theia-problem-indicator.ts CHANGED
@@ -17,14 +17,8 @@
17
17
  import { ElementHandle } from '@playwright/test';
18
18
  import { TheiaStatusIndicator } from './theia-status-indicator';
19
19
 
20
- const PROBLEM_ICON = 'codicon-error';
21
-
22
20
  export class TheiaProblemIndicator extends TheiaStatusIndicator {
23
-
24
- override async isVisible(): Promise<boolean> {
25
- const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
26
- return !!handle && handle.isVisible();
27
- }
21
+ id = 'problem-marker-status';
28
22
 
29
23
  async numberOfProblems(): Promise<number> {
30
24
  const spans = await this.getSpans();
@@ -37,8 +31,7 @@ export class TheiaProblemIndicator extends TheiaStatusIndicator {
37
31
  }
38
32
 
39
33
  protected async getSpans(): Promise<ElementHandle[] | undefined> {
40
- const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
34
+ const handle = await this.getElementHandle();
41
35
  return handle?.$$('span');
42
36
  }
43
-
44
37
  }
package/src/theia-status-indicator.ts CHANGED
@@ -17,60 +17,31 @@
17
17
  import { ElementHandle } from '@playwright/test';
18
18
  import { TheiaPageObject } from './theia-page-object';
19
19
 
20
- export class TheiaStatusIndicator extends TheiaPageObject {
20
+ export abstract class TheiaStatusIndicator extends TheiaPageObject {
21
+ protected abstract id: string;
21
22
 
22
- protected elementSpanSelector = '#theia-statusBar .element span';
23
+ protected statusBarElementSelector = '#theia-statusBar div.element';
23
24
 
24
- protected async getElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
25
- return this.page.$(this.elementSpanSelector);
25
+ protected getSelectorForId(id: string): string {
26
+ return `${this.statusBarElementSelector}#status-bar-${id}`;
26
27
  }
27
28
 
28
- async waitForVisible(): Promise<void> {
29
- await this.page.waitForSelector(this.elementSpanSelector);
29
+ async waitForVisible(waitForDetached = false): Promise<void> {
30
+ await this.page.waitForSelector(this.getSelectorForId(this.id), waitForDetached ? { state: 'detached' } : {});
30
31
  }
31
32
 
32
- protected getSelectorByTitle(title: string): string {
33
- return `.element[title="${title}"]`;
34
- }
35
-
36
- async getElementHandleByTitle(title: string): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
37
- // Fetch element via title in case status elements exist without a dedicated Codicon icon
38
- return this.page.$(this.getSelectorByTitle(title));
39
- }
40
-
41
- protected getSelectorByIcon(icon: string): string {
42
- return `${this.elementSpanSelector}.codicon.${icon}`;
43
- }
44
-
45
- async getElementHandleByIcon(iconClass: string | string[], titleContain = ''): Promise<ElementHandle<SVGElement | HTMLElement> | null> {
46
- const icons = Array.isArray(iconClass) ? iconClass : [iconClass];
47
- for (const icon of icons) {
48
- const span = await this.page.$(this.getSelectorByIcon(icon));
49
- if (span) {
50
- const parent = await span.$('..');
51
- if (titleContain === '') {
52
- return parent;
53
- } else {
54
- const parentTitle = await parent?.getAttribute('title');
55
- if (parentTitle?.includes(titleContain)) { return parent; }
56
- }
57
- }
33
+ async getElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement>> {
34
+ const element = await this.page.$(this.getSelectorForId(this.id));
35
+ if (element) {
36
+ return element;
58
37
  }
59
- throw new Error('Cannot find indicator');
60
- }
61
-
62
- async waitForVisibleByTitle(title: string, waitForDetached = false): Promise<void> {
63
- await this.page.waitForSelector(this.getSelectorByTitle(title), waitForDetached ? { state: 'detached' } : {});
64
- }
65
-
66
- async waitForVisibleByIcon(icon: string, waitForDetached = false): Promise<void> {
67
- await this.page.waitForSelector(this.getSelectorByIcon(icon), waitForDetached ? { state: 'detached' } : {});
38
+ throw new Error('Could not find status bar element with ID ' + this.id);
68
39
  }
69
40
 
70
- async isVisible(icon: string | string[], titleContain = ''): Promise<boolean> {
41
+ async isVisible(): Promise<boolean> {
71
42
  try {
72
- const element = await this.getElementHandleByIcon(icon, titleContain);
73
- return !!element && element.isVisible();
43
+ const element = await this.getElementHandle();
44
+ return element.isVisible();
74
45
  } catch (err) {
75
46
  return false;
76
47
  }
package/src/theia-toggle-bottom-indicator.ts CHANGED
@@ -16,10 +16,6 @@
16
16
 
17
17
  import { TheiaStatusIndicator } from './theia-status-indicator';
18
18
 
19
- const TOGGLE_BOTTOM_ICON = 'codicon-window';
20
-
21
19
  export class TheiaToggleBottomIndicator extends TheiaStatusIndicator {
22
- override async isVisible(): Promise<boolean> {
23
- return super.isVisible(TOGGLE_BOTTOM_ICON);
24
- }
20
+ id = 'bottom-panel-toggle';
25
21
  }