@theia/playwright 1.26.0-next.7 → 1.26.0

package/lib/theia-problem-indicator.js

@@ -17,11 +17,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TheiaProblemIndicator = void 0;
 const theia_status_indicator_1 = require("./theia-status-indicator");
-const PROBLEM_ICON = 'codicon-error';
 class TheiaProblemIndicator extends theia_status_indicator_1.TheiaStatusIndicator {
-    async isVisible() {
-        const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
-        return !!handle && handle.isVisible();
+    constructor() {
+        super(...arguments);
+        this.id = 'problem-marker-status';
     }
     async numberOfProblems() {
         const spans = await this.getSpans();
@@ -32,7 +31,7 @@ class TheiaProblemIndicator extends theia_status_indicator_1.TheiaStatusIndicato
         return spans ? +await spans[3].innerText() : -1;
     }
     async getSpans() {
-        const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
+        const handle = await this.getElementHandle();
         return handle === null || handle === void 0 ? void 0 : handle.$$('span');
     }
 }

package/lib/theia-problem-indicator.js.map

@@ -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"}
+{"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

@@ -1,15 +1,11 @@
 import { ElementHandle } from '@playwright/test';
 import { TheiaPageObject } from './theia-page-object';
-export declare class TheiaStatusIndicator extends TheiaPageObject {
-    protected elementSpanSelector: string;
-    protected getElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
-    waitForVisible(): Promise<void>;
-    protected getSelectorByTitle(title: string): string;
-    getElementHandleByTitle(title: string): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
-    protected getSelectorByIcon(icon: string): string;
-    getElementHandleByIcon(iconClass: string | string[], titleContain?: string): Promise<ElementHandle<SVGElement | HTMLElement> | null>;
-    waitForVisibleByTitle(title: string, waitForDetached?: boolean): Promise<void>;
-    waitForVisibleByIcon(icon: string, waitForDetached?: boolean): Promise<void>;
-    isVisible(icon: string | string[], titleContain?: string): Promise<boolean>;
+export declare abstract class TheiaStatusIndicator extends TheiaPageObject {
+    protected abstract id: string;
+    protected statusBarElementSelector: string;
+    protected getSelectorForId(id: string): string;
+    waitForVisible(waitForDetached?: boolean): Promise<void>;
+    getElementHandle(): Promise<ElementHandle<SVGElement | HTMLElement>>;
+    isVisible(): Promise<boolean>;
 }
 //# sourceMappingURL=theia-status-indicator.d.ts.map

package/lib/theia-status-indicator.d.ts.map

@@ -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"}
+{"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

@@ -20,53 +20,25 @@ const theia_page_object_1 = require("./theia-page-object");
 class TheiaStatusIndicator extends theia_page_object_1.TheiaPageObject {
     constructor() {
         super(...arguments);
-        this.elementSpanSelector = '#theia-statusBar .element span';
+        this.statusBarElementSelector = '#theia-statusBar div.element';
     }
-    async getElementHandle() {
-        return this.page.$(this.elementSpanSelector);
-    }
-    async waitForVisible() {
-        await this.page.waitForSelector(this.elementSpanSelector);
-    }
-    getSelectorByTitle(title) {
-        return `.element[title="${title}"]`;
-    }
-    async getElementHandleByTitle(title) {
-        // Fetch element via title in case status elements exist without a dedicated Codicon icon
-        return this.page.$(this.getSelectorByTitle(title));
+    getSelectorForId(id) {
+        return `${this.statusBarElementSelector}#status-bar-${id}`;
     }
-    getSelectorByIcon(icon) {
-        return `${this.elementSpanSelector}.codicon.${icon}`;
+    async waitForVisible(waitForDetached = false) {
+        await this.page.waitForSelector(this.getSelectorForId(this.id), waitForDetached ? { state: 'detached' } : {});
     }
-    async getElementHandleByIcon(iconClass, titleContain = '') {
-        const icons = Array.isArray(iconClass) ? iconClass : [iconClass];
-        for (const icon of icons) {
-            const span = await this.page.$(this.getSelectorByIcon(icon));
-            if (span) {
-                const parent = await span.$('..');
-                if (titleContain === '') {
-                    return parent;
-                }
-                else {
-                    const parentTitle = await (parent === null || parent === void 0 ? void 0 : parent.getAttribute('title'));
-                    if (parentTitle === null || parentTitle === void 0 ? void 0 : parentTitle.includes(titleContain)) {
-                        return parent;
-                    }
-                }
-            }
+    async getElementHandle() {
+        const element = await this.page.$(this.getSelectorForId(this.id));
+        if (element) {
+            return element;
         }
-        throw new Error('Cannot find indicator');
-    }
-    async waitForVisibleByTitle(title, waitForDetached = false) {
-        await this.page.waitForSelector(this.getSelectorByTitle(title), waitForDetached ? { state: 'detached' } : {});
-    }
-    async waitForVisibleByIcon(icon, waitForDetached = false) {
-        await this.page.waitForSelector(this.getSelectorByIcon(icon), waitForDetached ? { state: 'detached' } : {});
+        throw new Error('Could not find status bar element with ID ' + this.id);
     }
-    async isVisible(icon, titleContain = '') {
+    async isVisible() {
         try {
-            const element = await this.getElementHandleByIcon(icon, titleContain);
-            return !!element && element.isVisible();
+            const element = await this.getElementHandle();
+            return element.isVisible();
         }
         catch (err) {
             return false;

package/lib/theia-status-indicator.js.map

@@ -1 +1 @@
-{"version":3,"file":"theia-status-indicator.js","sourceRoot":"","sources":["../src/theia-status-indicator.ts"],"names":[],"mappings":"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"}
+{"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

@@ -1,5 +1,5 @@
 import { TheiaStatusIndicator } from './theia-status-indicator';
 export declare class TheiaToggleBottomIndicator extends TheiaStatusIndicator {
-    isVisible(): Promise<boolean>;
+    id: string;
 }
 //# sourceMappingURL=theia-toggle-bottom-indicator.d.ts.map

package/lib/theia-toggle-bottom-indicator.d.ts.map

@@ -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"}
+{"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

@@ -17,10 +17,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TheiaToggleBottomIndicator = void 0;
 const theia_status_indicator_1 = require("./theia-status-indicator");
-const TOGGLE_BOTTOM_ICON = 'codicon-window';
 class TheiaToggleBottomIndicator extends theia_status_indicator_1.TheiaStatusIndicator {
-    async isVisible() {
-        return super.isVisible(TOGGLE_BOTTOM_ICON);
+    constructor() {
+        super(...arguments);
+        this.id = 'bottom-panel-toggle';
     }
 }
 exports.TheiaToggleBottomIndicator = TheiaToggleBottomIndicator;

package/lib/theia-toggle-bottom-indicator.js.map

@@ -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"}
+{"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

@@ -1,6 +1,6 @@
 {
   "name": "@theia/playwright",
-  "version": "1.26.0-next.7+b9e19491f5c",
+  "version": "1.26.0",
   "description": "System tests for Theia",
   "license": "EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0",
   "repository": {
@@ -41,5 +41,5 @@
     "access": "public"
   },
   "main": "lib/index",
-  "gitHead": "b9e19491f5c1e3203615dd60bd673d5c4b156bd2"
+  "gitHead": "38e2466568e69d55a9c64c96878deff5a005b814"
 }

package/src/tests/theia-preference-view.test.ts

@@ -38,14 +38,14 @@ test.describe('Preference View', () => {
         const preferences = await app.openPreferences(TheiaPreferenceView);
         const preferenceId = PreferenceIds.DiffEditor.MaxComputationTime;
 
-        await preferences.resetStringPreferenceById(preferenceId);
+        await preferences.resetPreferenceById(preferenceId);
         expect(await preferences.getStringPreferenceById(preferenceId)).toBe(DefaultPreferences.DiffEditor.MaxComputationTime);
 
         await preferences.setStringPreferenceById(preferenceId, '8000');
         await preferences.waitForModified(preferenceId);
         expect(await preferences.getStringPreferenceById(preferenceId)).toBe('8000');
 
-        await preferences.resetStringPreferenceById(preferenceId);
+        await preferences.resetPreferenceById(preferenceId);
         expect(await preferences.getStringPreferenceById(preferenceId)).toBe(DefaultPreferences.DiffEditor.MaxComputationTime);
     });
 
@@ -53,29 +53,48 @@ test.describe('Preference View', () => {
         const preferences = await app.openPreferences(TheiaPreferenceView);
         const preferenceId = PreferenceIds.Explorer.AutoReveal;
 
-        await preferences.resetBooleanPreferenceById(preferenceId);
+        await preferences.resetPreferenceById(preferenceId);
         expect(await preferences.getBooleanPreferenceById(preferenceId)).toBe(DefaultPreferences.Explorer.AutoReveal.Enabled);
 
         await preferences.setBooleanPreferenceById(preferenceId, false);
         await preferences.waitForModified(preferenceId);
         expect(await preferences.getBooleanPreferenceById(preferenceId)).toBe(false);
 
-        await preferences.resetBooleanPreferenceById(preferenceId);
+        await preferences.resetPreferenceById(preferenceId);
         expect(await preferences.getBooleanPreferenceById(preferenceId)).toBe(DefaultPreferences.Explorer.AutoReveal.Enabled);
     });
 
+    test('should be able to read, set, and reset Options preferences', async () => {
+        const preferences = await app.openPreferences(TheiaPreferenceView);
+        const preferenceId = PreferenceIds.Editor.RenderWhitespace;
+
+        await preferences.resetPreferenceById(preferenceId);
+        expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.Selection);
+
+        await preferences.setOptionsPreferenceById(preferenceId, DefaultPreferences.Editor.RenderWhitespace.Boundary);
+        await preferences.waitForModified(preferenceId);
+        expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.Boundary);
+
+        await preferences.resetPreferenceById(preferenceId);
+        expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.Selection);
+    });
+
     test('should throw an error if we try to read, set, or reset a non-existing preference', async () => {
         const preferences = await app.openPreferences(TheiaPreferenceView);
 
         preferences.customTimeout = 500;
         try {
-            await expect(preferences.getBooleanPreferenceById('no.a.real.preference')).rejects.toThrowError();
-            await expect(preferences.setBooleanPreferenceById('no.a.real.preference', true)).rejects.toThrowError();
-            await expect(preferences.resetBooleanPreferenceById('no.a.real.preference')).rejects.toThrowError();
+            await expect(preferences.getBooleanPreferenceById('not.a.real.preference')).rejects.toThrowError();
+            await expect(preferences.setBooleanPreferenceById('not.a.real.preference', true)).rejects.toThrowError();
+            await expect(preferences.resetPreferenceById('not.a.real.preference')).rejects.toThrowError();
 
-            await expect(preferences.getStringPreferenceById('no.a.real.preference')).rejects.toThrowError();
-            await expect(preferences.setStringPreferenceById('no.a.real.preference', 'a')).rejects.toThrowError();
-            await expect(preferences.resetStringPreferenceById('no.a.real.preference')).rejects.toThrowError();
+            await expect(preferences.getStringPreferenceById('not.a.real.preference')).rejects.toThrowError();
+            await expect(preferences.setStringPreferenceById('not.a.real.preference', 'a')).rejects.toThrowError();
+            await expect(preferences.resetPreferenceById('not.a.real.preference')).rejects.toThrowError();
+
+            await expect(preferences.getOptionsPreferenceById('not.a.real.preference')).rejects.toThrowError();
+            await expect(preferences.setOptionsPreferenceById('not.a.real.preference', 'a')).rejects.toThrowError();
+            await expect(preferences.resetPreferenceById('not.a.real.preference')).rejects.toThrowError();
         } finally {
             preferences.customTimeout = undefined;
         }
@@ -86,8 +105,14 @@ test.describe('Preference View', () => {
         const stringPreference = PreferenceIds.DiffEditor.MaxComputationTime;
         const booleanPreference = PreferenceIds.Explorer.AutoReveal;
 
-        await expect(preferences.getBooleanPreferenceById(stringPreference)).rejects.toThrowError();
-        await expect(preferences.setBooleanPreferenceById(stringPreference, true)).rejects.toThrowError();
-        await expect(preferences.setStringPreferenceById(booleanPreference, 'true')).rejects.toThrowError();
+        preferences.customTimeout = 500;
+        try {
+            await expect(preferences.getBooleanPreferenceById(stringPreference)).rejects.toThrowError();
+            await expect(preferences.setBooleanPreferenceById(stringPreference, true)).rejects.toThrowError();
+            await expect(preferences.setStringPreferenceById(booleanPreference, 'true')).rejects.toThrowError();
+            await expect(preferences.setOptionsPreferenceById(booleanPreference, 'true')).rejects.toThrowError();
+        } finally {
+            preferences.customTimeout = undefined;
+        }
     });
 });

package/src/tests/theia-text-editor.test.ts

@@ -15,6 +15,7 @@
 // *****************************************************************************
 
 import { expect } from '@playwright/test';
+import { DefaultPreferences, PreferenceIds, TheiaPreferenceView } from '../theia-preference-view';
 import { TheiaApp } from '../theia-app';
 import { TheiaTextEditor } from '../theia-text-editor';
 import { TheiaWorkspace } from '../theia-workspace';
@@ -27,6 +28,11 @@ test.describe('Theia Text Editor', () => {
     test.beforeAll(async () => {
         const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']);
         app = await TheiaApp.load(page, ws);
+
+        // set auto-save preference to off
+        const preferenceView = await app.openPreferences(TheiaPreferenceView);
+        await preferenceView.setOptionsPreferenceById(PreferenceIds.Editor.AutoSave, DefaultPreferences.Editor.AutoSave.Off);
+        await preferenceView.close();
     });
 
     test('should be visible and active after opening "sample.txt"', async () => {
@@ -164,7 +170,7 @@ test.describe('Theia Text Editor', () => {
         await sampleTextEditor.saveAndClose();
     });
 
-    test.skip('should close without saving', async () => {
+    test('should close without saving', async () => {
         const sampleTextEditor = await app.openEditor('sample.txt', TheiaTextEditor);
         await sampleTextEditor.replaceLineWithLineNumber('change again', 1);
         expect(await sampleTextEditor.isDirty()).toBe(true);

package/src/theia-notification-indicator.ts

@@ -16,31 +16,26 @@
 
 import { TheiaStatusIndicator } from './theia-status-indicator';
 
-const NOTIFICATION_ICON = 'codicon-bell';
 const NOTIFICATION_DOT_ICON = 'codicon-bell-dot';
-const NOTIFICATION_ICONS = [NOTIFICATION_ICON, NOTIFICATION_DOT_ICON];
 
 export class TheiaNotificationIndicator extends TheiaStatusIndicator {
-
-    protected get title(): string {
-        return 'Notification';
-    }
-
-    override async isVisible(): Promise<boolean> {
-        return super.isVisible(NOTIFICATION_ICONS, this.title);
-    }
+    id = 'theia-notification-center';
 
     async hasNotifications(): Promise<boolean> {
-        return super.isVisible(NOTIFICATION_DOT_ICON, this.title);
+        const container = await this.getElementHandle();
+        const bellWithDot = await container.$(`.${NOTIFICATION_DOT_ICON}`);
+        return Boolean(bellWithDot?.isVisible());
     }
 
     override async waitForVisible(expectNotifications = false): Promise<void> {
-        await super.waitForVisibleByIcon(expectNotifications ? NOTIFICATION_DOT_ICON : NOTIFICATION_ICON);
+        await super.waitForVisible();
+        if (expectNotifications && !(await this.hasNotifications())) {
+            throw new Error('No notifications when notifications expected.');
+        }
     }
 
     async toggleOverlay(): Promise<void> {
-        const hasNotifications = await this.hasNotifications();
-        const element = await this.getElementHandleByIcon(hasNotifications ? NOTIFICATION_DOT_ICON : NOTIFICATION_ICON, this.title);
+        const element = await this.getElementHandle();
         if (element) {
             await element.click();
         }

package/src/theia-preference-view.ts

@@ -24,6 +24,10 @@ const TheiaSettingsViewData = {
 };
 
 export const PreferenceIds = {
+    Editor: {
+        AutoSave: 'files.autoSave',
+        RenderWhitespace: 'editor.renderWhitespace'
+    },
     Explorer: {
         AutoReveal: 'explorer.autoReveal'
     },
@@ -33,6 +37,21 @@ export const PreferenceIds = {
 };
 
 export const DefaultPreferences = {
+    Editor: {
+        AutoSave: {
+            Off: 'off',
+            AfterDelay: 'afterDelay',
+            OnFocusChange: 'onFocusChange',
+            OnWindowChange: 'onWindowChange'
+        },
+        RenderWhitespace: {
+            None: 'none',
+            Boundary: 'boundary',
+            Selection: 'selection',
+            Trailing: 'trailing',
+            All: 'all'
+        }
+    },
     Explorer: {
         AutoReveal: {
             Enabled: true
@@ -50,6 +69,10 @@ export enum TheiaPreferenceScope {
 
 export class TheiaPreferenceView extends TheiaView {
     public customTimeout?: number;
+    protected modificationIndicator = '.theia-mod-item-modified';
+    protected optionSelectLabel = '.theia-select-component-label';
+    protected optionSelectDropdown = '.theia-select-component-dropdown';
+    protected optionSelectDropdownValue = '.theia-select-component-option-value';
 
     constructor(app: TheiaApp) {
         super(TheiaSettingsViewData, app);
@@ -72,14 +95,19 @@ export class TheiaPreferenceView extends TheiaView {
         await scopeTab.click();
     }
 
+    async getBooleanPreferenceByPath(sectionTitle: string, name: string): Promise<boolean> {
+        const preferenceId = await this.findPreferenceId(sectionTitle, name);
+        return this.getBooleanPreferenceById(preferenceId);
+    }
+
     async getBooleanPreferenceById(preferenceId: string): Promise<boolean> {
         const element = await this.findPreferenceEditorById(preferenceId);
         return element.isChecked();
     }
 
-    async getBooleanPreferenceByPath(sectionTitle: string, name: string): Promise<boolean> {
+    async setBooleanPreferenceByPath(sectionTitle: string, name: string, value: boolean): Promise<void> {
         const preferenceId = await this.findPreferenceId(sectionTitle, name);
-        return this.getBooleanPreferenceById(preferenceId);
+        return this.setBooleanPreferenceById(preferenceId, value);
     }
 
     async setBooleanPreferenceById(preferenceId: string, value: boolean): Promise<void> {
@@ -87,9 +115,9 @@ export class TheiaPreferenceView extends TheiaView {
         return value ? element.check() : element.uncheck();
     }
 
-    async setBooleanPreferenceByPath(sectionTitle: string, name: string, value: boolean): Promise<void> {
+    async getStringPreferenceByPath(sectionTitle: string, name: string): Promise<string> {
         const preferenceId = await this.findPreferenceId(sectionTitle, name);
-        return this.setBooleanPreferenceById(preferenceId, value);
+        return this.getStringPreferenceById(preferenceId);
     }
 
     async getStringPreferenceById(preferenceId: string): Promise<string> {
@@ -97,9 +125,9 @@ export class TheiaPreferenceView extends TheiaView {
         return element.evaluate(e => (e as HTMLInputElement).value);
     }
 
-    async getStringPreferenceByPath(sectionTitle: string, name: string): Promise<string> {
+    async setStringPreferenceByPath(sectionTitle: string, name: string, value: string): Promise<void> {
         const preferenceId = await this.findPreferenceId(sectionTitle, name);
-        return this.getStringPreferenceById(preferenceId);
+        return this.setStringPreferenceById(preferenceId, value);
     }
 
     async setStringPreferenceById(preferenceId: string, value: string): Promise<void> {
@@ -107,63 +135,39 @@ export class TheiaPreferenceView extends TheiaView {
         return element.fill(value);
     }
 
-    async setStringPreferenceByPath(sectionTitle: string, name: string, value: string): Promise<void> {
+    async getOptionsPreferenceByPath(sectionTitle: string, name: string): Promise<string> {
         const preferenceId = await this.findPreferenceId(sectionTitle, name);
-        return this.setStringPreferenceById(preferenceId, value);
+        return this.getOptionsPreferenceById(preferenceId);
     }
 
-    async waitForModified(preferenceId: string): Promise<void> {
-        await this.activate();
-        const viewElement = await this.viewElement();
-        await viewElement?.waitForSelector(`${this.getPreferenceGutterSelector(preferenceId)}.theia-mod-item-modified`, { timeout: this.customTimeout });
+    async getOptionsPreferenceById(preferenceId: string): Promise<string> {
+        const element = await this.findPreferenceEditorById(preferenceId, this.optionSelectLabel);
+        return element.evaluate(e => e.textContent ?? '');
     }
 
-    async resetStringPreferenceById(preferenceId: string): Promise<void> {
-        const resetPreferenceButton = await this.findPreferenceResetButton(preferenceId);
-        if (!resetPreferenceButton) {
-            // preference not modified
-            return;
-        }
-        const previousValue = await this.getStringPreferenceById(preferenceId);
-        const selector = this.getPreferenceEditorSelector(preferenceId);
-        const done = await resetPreferenceButton.click();
-        await this.page.waitForFunction(data => {
-            const element = document.querySelector(data.selector);
-            if (!element) {
-                throw new Error(`Could not find preference element with id "${data.preferenceId}"`);
-            }
-            const value = (element as HTMLInputElement).value;
-            return value !== data.previousValue;
-        }, { preferenceId, selector, previousValue, done }, { timeout: this.customTimeout });
-    }
-
-    async resetStringPreferenceByPath(sectionTitle: string, name: string): Promise<void> {
+    async setOptionsPreferenceByPath(sectionTitle: string, name: string, value: string): Promise<void> {
         const preferenceId = await this.findPreferenceId(sectionTitle, name);
-        return this.resetStringPreferenceById(preferenceId);
+        return this.setOptionsPreferenceById(preferenceId, value);
     }
 
-    async resetBooleanPreferenceById(preferenceId: string): Promise<void> {
-        const resetPreferenceButton = await this.findPreferenceResetButton(preferenceId);
-        if (!resetPreferenceButton) {
-            // preference not modified
-            return;
-        }
-        const previousValue = await this.getBooleanPreferenceById(preferenceId);
-        const selector = this.getPreferenceEditorSelector(preferenceId);
-        const done = await resetPreferenceButton.click();
-        await this.page.waitForFunction(data => {
-            const element = document.querySelector(data.selector);
-            if (!element) {
-                throw new Error(`Could not find preference element with id "${data.preferenceId}"`);
-            }
-            const value = (element as HTMLInputElement).checked;
-            return value !== data.previousValue;
-        }, { preferenceId, selector, previousValue, done }, { timeout: this.customTimeout });
-    }
-
-    async resetBooleanPreferenceByPath(sectionTitle: string, name: string): Promise<void> {
+    async setOptionsPreferenceById(preferenceId: string, value: string): Promise<void> {
+        const element = await this.findPreferenceEditorById(preferenceId, this.optionSelectLabel);
+        await element.click();
+        const option = await this.page.waitForSelector(`${this.optionSelectDropdown} ${this.optionSelectDropdownValue}:has-text("${value}")`);
+        await option.click();
+    }
+
+    async resetPreferenceByPath(sectionTitle: string, name: string): Promise<void> {
         const preferenceId = await this.findPreferenceId(sectionTitle, name);
-        return this.resetBooleanPreferenceById(preferenceId);
+        return this.resetPreferenceById(preferenceId);
+    }
+
+    async resetPreferenceById(preferenceId: string): Promise<void> {
+        // this is just to fail if the preference doesn't exist at all
+        await this.findPreferenceEditorById(preferenceId, '');
+        const resetPreferenceButton = await this.findPreferenceResetButton(preferenceId);
+        await resetPreferenceButton.click();
+        await this.waitForUnmodified(preferenceId);
     }
 
     private async findPreferenceId(sectionTitle: string, name: string): Promise<string> {
@@ -178,9 +182,9 @@ export class TheiaPreferenceView extends TheiaView {
         return preferenceId;
     }
 
-    private async findPreferenceEditorById(preferenceId: string): Promise<ElementHandle<SVGElement | HTMLElement>> {
+    private async findPreferenceEditorById(preferenceId: string, elementType: string = 'input'): Promise<ElementHandle<SVGElement | HTMLElement>> {
         const viewElement = await this.viewElement();
-        const element = await viewElement?.waitForSelector(this.getPreferenceEditorSelector(preferenceId), { timeout: this.customTimeout });
+        const element = await viewElement?.waitForSelector(this.getPreferenceEditorSelector(preferenceId, elementType), { timeout: this.customTimeout });
         if (!element) {
             throw new Error(`Could not find element with preference id "${preferenceId}"`);
         }
@@ -191,26 +195,13 @@ export class TheiaPreferenceView extends TheiaView {
         return `li[data-pref-id="${preferenceId}"]`;
     }
 
-    private getPreferenceEditorSelector(preferenceId: string): string {
-        return `${this.getPreferenceSelector(preferenceId)} input`;
+    private getPreferenceEditorSelector(preferenceId: string, elementType: string): string {
+        return `${this.getPreferenceSelector(preferenceId)} ${elementType}`;
     }
 
-    private getPreferenceGutterSelector(preferenceId: string): string {
-        return `${this.getPreferenceSelector(preferenceId)} .pref-context-gutter`;
-    }
-
-    private async findPreferenceResetButton(preferenceId: string): Promise<ElementHandle<SVGElement | HTMLElement> | undefined> {
+    private async findPreferenceResetButton(preferenceId: string): Promise<ElementHandle<SVGElement | HTMLElement>> {
         await this.activate();
         const viewElement = await this.viewElement();
-        const gutter = await viewElement?.waitForSelector(`${this.getPreferenceGutterSelector(preferenceId)}`, { timeout: this.customTimeout });
-        if (!gutter) {
-            throw new Error(`Could not determine modified state for element with preference id "${preferenceId}"`);
-        }
-        const isModified = await gutter.evaluate(e => e.classList.contains('theia-mod-item-modified'));
-        if (!isModified) {
-            return undefined;
-        }
-
         const settingsContextMenuBtn = await viewElement?.waitForSelector(`${this.getPreferenceSelector(preferenceId)} .settings-context-menu-btn`);
         if (!settingsContextMenuBtn) {
             throw new Error(`Could not find context menu button for element with preference id "${preferenceId}"`);
@@ -223,4 +214,19 @@ export class TheiaPreferenceView extends TheiaView {
         return resetPreferenceButton;
     }
 
+    async waitForModified(preferenceId: string): Promise<void> {
+        await this.activate();
+        const viewElement = await this.viewElement();
+        await viewElement?.waitForSelector(`${this.getPreferenceGutterSelector(preferenceId)}${this.modificationIndicator}`, { timeout: this.customTimeout });
+    }
+
+    async waitForUnmodified(preferenceId: string): Promise<void> {
+        await this.activate();
+        const viewElement = await this.viewElement();
+        await viewElement?.waitForSelector(`${this.getPreferenceGutterSelector(preferenceId)}${this.modificationIndicator}`, { state: 'detached', timeout: this.customTimeout });
+    }
+
+    private getPreferenceGutterSelector(preferenceId: string): string {
+        return `${this.getPreferenceSelector(preferenceId)} .pref-context-gutter`;
+    }
 }

package/src/theia-problem-indicator.ts

@@ -17,14 +17,8 @@
 import { ElementHandle } from '@playwright/test';
 import { TheiaStatusIndicator } from './theia-status-indicator';
 
-const PROBLEM_ICON = 'codicon-error';
-
 export class TheiaProblemIndicator extends TheiaStatusIndicator {
-
-    override async isVisible(): Promise<boolean> {
-        const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
-        return !!handle && handle.isVisible();
-    }
+    id = 'problem-marker-status';
 
     async numberOfProblems(): Promise<number> {
         const spans = await this.getSpans();
@@ -37,8 +31,7 @@ export class TheiaProblemIndicator extends TheiaStatusIndicator {
     }
 
     protected async getSpans(): Promise<ElementHandle[] | undefined> {
-        const handle = await super.getElementHandleByIcon(PROBLEM_ICON);
+        const handle = await this.getElementHandle();
         return handle?.$$('span');
     }
-
 }