Skip to content

Commit a09c3d9

Browse files
committed
Reactivate all text editor tests
Due to the Monaco uplift, we had to temporarily skip a test, because it affected the default preference regarding auto-save. To re-enable the test, we now explicitly set the auto save preference to `off` before the test. This way the preference value is ensured to be consistent. See also #10736 Fixes #10891 Change-Id: I6ab22a71848e174313a30f9121cb4b3dec363f12
1 parent 9dc2ab5 commit a09c3d9

File tree

3 files changed

+14
-6
lines changed

3 files changed

+14
-6
lines changed

examples/playwright/src/tests/theia-preference-view.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,14 +69,14 @@ test.describe('Preference View', () => {
6969
const preferenceId = PreferenceIds.Editor.RenderWhitespace;
7070

7171
await preferences.resetPreferenceById(preferenceId);
72-
expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.None);
72+
expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.Selection);
7373

7474
await preferences.setOptionsPreferenceById(preferenceId, DefaultPreferences.Editor.RenderWhitespace.Boundary);
7575
await preferences.waitForModified(preferenceId);
7676
expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.Boundary);
7777

7878
await preferences.resetPreferenceById(preferenceId);
79-
expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.None);
79+
expect(await preferences.getOptionsPreferenceById(preferenceId)).toBe(DefaultPreferences.Editor.RenderWhitespace.Selection);
8080
});
8181

8282
test('should throw an error if we try to read, set, or reset a non-existing preference', async () => {

examples/playwright/src/tests/theia-text-editor.test.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
// *****************************************************************************
1616

1717
import { expect } from '@playwright/test';
18+
import { DefaultPreferences, PreferenceIds, TheiaPreferenceView } from '../theia-preference-view';
1819
import { TheiaApp } from '../theia-app';
1920
import { TheiaTextEditor } from '../theia-text-editor';
2021
import { TheiaWorkspace } from '../theia-workspace';
@@ -27,6 +28,11 @@ test.describe('Theia Text Editor', () => {
2728
test.beforeAll(async () => {
2829
const ws = new TheiaWorkspace(['src/tests/resources/sample-files1']);
2930
app = await TheiaApp.load(page, ws);
31+
32+
// set auto-save preference to off
33+
const preferenceView = await app.openPreferences(TheiaPreferenceView);
34+
await preferenceView.setOptionsPreferenceById(PreferenceIds.Editor.AutoSave, DefaultPreferences.Editor.AutoSave.Off);
35+
await preferenceView.close();
3036
});
3137

3238
test('should be visible and active after opening "sample.txt"', async () => {
@@ -164,7 +170,7 @@ test.describe('Theia Text Editor', () => {
164170
await sampleTextEditor.saveAndClose();
165171
});
166172

167-
test.skip('should close without saving', async () => {
173+
test('should close without saving', async () => {
168174
const sampleTextEditor = await app.openEditor('sample.txt', TheiaTextEditor);
169175
await sampleTextEditor.replaceLineWithLineNumber('change again', 1);
170176
expect(await sampleTextEditor.isDirty()).toBe(true);

examples/playwright/src/theia-preference-view.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const TheiaSettingsViewData = {
2525

2626
export const PreferenceIds = {
2727
Editor: {
28-
AutoSave: 'editor.autoSave',
28+
AutoSave: 'files.autoSave',
2929
RenderWhitespace: 'editor.renderWhitespace'
3030
},
3131
Explorer: {
@@ -39,8 +39,10 @@ export const PreferenceIds = {
3939
export const DefaultPreferences = {
4040
Editor: {
4141
AutoSave: {
42-
On: 'on',
43-
Off: 'off'
42+
Off: 'off',
43+
AfterDelay: 'afterDelay',
44+
OnFocusChange: 'onFocusChange',
45+
OnWindowChange: 'onWindowChange'
4446
},
4547
RenderWhitespace: {
4648
None: 'none',

0 commit comments

Comments
 (0)