@theia/workspace 1.77.0-next.1 → 1.77.0-next.101
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/browser/canonical-uri-service.js +12 -16
- package/lib/browser/canonical-uri-service.js.map +1 -1
- package/lib/browser/diff-service.js +23 -29
- package/lib/browser/diff-service.js.map +1 -1
- package/lib/browser/index.d.ts +8 -8
- package/lib/browser/index.d.ts.map +1 -1
- package/lib/browser/index.js +8 -11
- package/lib/browser/index.js.map +1 -1
- package/lib/browser/metadata-storage/index.d.ts +2 -2
- package/lib/browser/metadata-storage/index.d.ts.map +1 -1
- package/lib/browser/metadata-storage/index.js +2 -9
- package/lib/browser/metadata-storage/index.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.d.ts +6 -2
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.d.ts.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.js +34 -36
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.spec.js +70 -73
- package/lib/browser/metadata-storage/workspace-metadata-storage-service.spec.js.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.d.ts +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.d.ts.map +1 -1
- package/lib/browser/metadata-storage/workspace-metadata-store.js +19 -28
- package/lib/browser/metadata-storage/workspace-metadata-store.js.map +1 -1
- package/lib/browser/quick-open-workspace.d.ts +2 -2
- package/lib/browser/quick-open-workspace.d.ts.map +1 -1
- package/lib/browser/quick-open-workspace.js +31 -40
- package/lib/browser/quick-open-workspace.js.map +1 -1
- package/lib/browser/test/with-workspace-service-defaults.d.ts +8 -0
- package/lib/browser/test/with-workspace-service-defaults.d.ts.map +1 -0
- package/lib/browser/test/with-workspace-service-defaults.js +25 -0
- package/lib/browser/test/with-workspace-service-defaults.js.map +1 -0
- package/lib/browser/untitled-workspace-exit-dialog.js +13 -17
- package/lib/browser/untitled-workspace-exit-dialog.js.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts +3 -1
- package/lib/browser/workspace-breadcrumbs-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-breadcrumbs-contribution.js +23 -14
- package/lib/browser/workspace-breadcrumbs-contribution.js.map +1 -1
- package/lib/browser/workspace-commands.d.ts +5 -5
- package/lib/browser/workspace-commands.d.ts.map +1 -1
- package/lib/browser/workspace-commands.js +129 -146
- package/lib/browser/workspace-commands.js.map +1 -1
- package/lib/browser/workspace-commands.spec.js +50 -52
- package/lib/browser/workspace-commands.spec.js.map +1 -1
- package/lib/browser/workspace-compare-handler.d.ts +1 -1
- package/lib/browser/workspace-compare-handler.d.ts.map +1 -1
- package/lib/browser/workspace-compare-handler.js +8 -12
- package/lib/browser/workspace-compare-handler.js.map +1 -1
- package/lib/browser/workspace-delete-handler.d.ts +2 -2
- package/lib/browser/workspace-delete-handler.d.ts.map +1 -1
- package/lib/browser/workspace-delete-handler.js +42 -51
- package/lib/browser/workspace-delete-handler.js.map +1 -1
- package/lib/browser/workspace-duplicate-handler.d.ts +2 -2
- package/lib/browser/workspace-duplicate-handler.d.ts.map +1 -1
- package/lib/browser/workspace-duplicate-handler.js +20 -27
- package/lib/browser/workspace-duplicate-handler.js.map +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.d.ts +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.d.ts.map +1 -1
- package/lib/browser/workspace-files-exclude-filter-provider.js +12 -19
- package/lib/browser/workspace-files-exclude-filter-provider.js.map +1 -1
- package/lib/browser/workspace-frontend-contribution.d.ts +4 -4
- package/lib/browser/workspace-frontend-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-frontend-contribution.js +129 -143
- package/lib/browser/workspace-frontend-contribution.js.map +1 -1
- package/lib/browser/workspace-frontend-module.js +85 -87
- package/lib/browser/workspace-frontend-module.js.map +1 -1
- package/lib/browser/workspace-input-dialog.js +13 -18
- package/lib/browser/workspace-input-dialog.js.map +1 -1
- package/lib/browser/workspace-schema-updater.d.ts +1 -1
- package/lib/browser/workspace-schema-updater.d.ts.map +1 -1
- package/lib/browser/workspace-schema-updater.js +36 -40
- package/lib/browser/workspace-schema-updater.js.map +1 -1
- package/lib/browser/workspace-search-filter-service.js +13 -20
- package/lib/browser/workspace-search-filter-service.js.map +1 -1
- package/lib/browser/workspace-search-filter-service.spec.js +18 -20
- package/lib/browser/workspace-search-filter-service.spec.js.map +1 -1
- package/lib/browser/workspace-service.d.ts +134 -5
- package/lib/browser/workspace-service.d.ts.map +1 -1
- package/lib/browser/workspace-service.js +409 -157
- package/lib/browser/workspace-service.js.map +1 -1
- package/lib/browser/workspace-service.spec.d.ts +2 -0
- package/lib/browser/workspace-service.spec.d.ts.map +1 -0
- package/lib/browser/workspace-service.spec.js +425 -0
- package/lib/browser/workspace-service.spec.js.map +1 -0
- package/lib/browser/workspace-storage-service.d.ts +1 -1
- package/lib/browser/workspace-storage-service.d.ts.map +1 -1
- package/lib/browser/workspace-storage-service.js +13 -21
- package/lib/browser/workspace-storage-service.js.map +1 -1
- package/lib/browser/workspace-trust-dialog.js +9 -13
- package/lib/browser/workspace-trust-dialog.js.map +1 -1
- package/lib/browser/workspace-trust-service.d.ts +3 -3
- package/lib/browser/workspace-trust-service.d.ts.map +1 -1
- package/lib/browser/workspace-trust-service.js +106 -127
- package/lib/browser/workspace-trust-service.js.map +1 -1
- package/lib/browser/workspace-trust-service.spec.js +146 -148
- package/lib/browser/workspace-trust-service.spec.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.d.ts +27 -2
- package/lib/browser/workspace-uri-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-uri-contribution.js +79 -32
- package/lib/browser/workspace-uri-contribution.js.map +1 -1
- package/lib/browser/workspace-uri-contribution.spec.js +130 -70
- package/lib/browser/workspace-uri-contribution.spec.js.map +1 -1
- package/lib/browser/workspace-user-working-directory-provider.d.ts +1 -1
- package/lib/browser/workspace-user-working-directory-provider.d.ts.map +1 -1
- package/lib/browser/workspace-user-working-directory-provider.js +13 -18
- package/lib/browser/workspace-user-working-directory-provider.js.map +1 -1
- package/lib/browser/workspace-utils.d.ts +1 -1
- package/lib/browser/workspace-utils.d.ts.map +1 -1
- package/lib/browser/workspace-utils.js +8 -12
- package/lib/browser/workspace-utils.js.map +1 -1
- package/lib/browser/workspace-variable-contribution.d.ts +1 -1
- package/lib/browser/workspace-variable-contribution.d.ts.map +1 -1
- package/lib/browser/workspace-variable-contribution.js +37 -47
- package/lib/browser/workspace-variable-contribution.js.map +1 -1
- package/lib/browser/workspace-window-title-updater.d.ts +1 -1
- package/lib/browser/workspace-window-title-updater.d.ts.map +1 -1
- package/lib/browser/workspace-window-title-updater.js +12 -16
- package/lib/browser/workspace-window-title-updater.js.map +1 -1
- package/lib/browser-only/browser-only-workspace-server.d.ts +1 -1
- package/lib/browser-only/browser-only-workspace-server.d.ts.map +1 -1
- package/lib/browser-only/browser-only-workspace-server.js +17 -22
- package/lib/browser-only/browser-only-workspace-server.js.map +1 -1
- package/lib/browser-only/workspace-frontend-only-module.js +8 -10
- package/lib/browser-only/workspace-frontend-only-module.js.map +1 -1
- package/lib/common/index.d.ts +4 -4
- package/lib/common/index.d.ts.map +1 -1
- package/lib/common/index.js +4 -7
- package/lib/common/index.js.map +1 -1
- package/lib/common/test/mock-workspace-server.d.ts +1 -1
- package/lib/common/test/mock-workspace-server.d.ts.map +1 -1
- package/lib/common/test/mock-workspace-server.js +5 -8
- package/lib/common/test/mock-workspace-server.js.map +1 -1
- package/lib/common/untitled-workspace-service.d.ts +1 -1
- package/lib/common/untitled-workspace-service.d.ts.map +1 -1
- package/lib/common/untitled-workspace-service.js +8 -12
- package/lib/common/untitled-workspace-service.js.map +1 -1
- package/lib/common/workspace-file-service.js +11 -14
- package/lib/common/workspace-file-service.js.map +1 -1
- package/lib/common/workspace-preferences.js +14 -19
- package/lib/common/workspace-preferences.js.map +1 -1
- package/lib/common/workspace-protocol.js +2 -5
- package/lib/common/workspace-protocol.js.map +1 -1
- package/lib/common/workspace-trust-preferences.js +29 -34
- package/lib/common/workspace-trust-preferences.js.map +1 -1
- package/lib/electron-browser/electron-workspace-contribution.d.ts +1 -1
- package/lib/electron-browser/electron-workspace-contribution.d.ts.map +1 -1
- package/lib/electron-browser/electron-workspace-contribution.js +11 -15
- package/lib/electron-browser/electron-workspace-contribution.js.map +1 -1
- package/lib/electron-browser/electron-workspace-module.js +6 -8
- package/lib/electron-browser/electron-workspace-module.js.map +1 -1
- package/lib/node/default-workspace-server.d.ts +1 -1
- package/lib/node/default-workspace-server.d.ts.map +1 -1
- package/lib/node/default-workspace-server.js +51 -63
- package/lib/node/default-workspace-server.js.map +1 -1
- package/lib/node/default-workspace-server.spec.js +29 -31
- package/lib/node/default-workspace-server.spec.js.map +1 -1
- package/lib/node/index.d.ts +2 -2
- package/lib/node/index.d.ts.map +1 -1
- package/lib/node/index.js +2 -5
- package/lib/node/index.js.map +1 -1
- package/lib/node/workspace-backend-module.js +21 -23
- package/lib/node/workspace-backend-module.js.map +1 -1
- package/package.json +17 -5
- package/src/browser/index.ts +8 -8
- package/src/browser/metadata-storage/index.ts +2 -2
- package/src/browser/metadata-storage/workspace-metadata-storage-service.spec.ts +4 -5
- package/src/browser/metadata-storage/workspace-metadata-storage-service.ts +10 -3
- package/src/browser/metadata-storage/workspace-metadata-store.ts +1 -1
- package/src/browser/quick-open-workspace.ts +2 -2
- package/src/browser/test/with-workspace-service-defaults.ts +26 -0
- package/src/browser/workspace-breadcrumbs-contribution.ts +16 -1
- package/src/browser/workspace-commands.spec.ts +6 -6
- package/src/browser/workspace-commands.ts +7 -8
- package/src/browser/workspace-compare-handler.ts +1 -1
- package/src/browser/workspace-delete-handler.ts +2 -2
- package/src/browser/workspace-duplicate-handler.ts +2 -2
- package/src/browser/workspace-files-exclude-filter-provider.ts +1 -1
- package/src/browser/workspace-frontend-contribution.ts +10 -8
- package/src/browser/workspace-frontend-module.ts +25 -25
- package/src/browser/workspace-schema-updater.ts +5 -1
- package/src/browser/workspace-search-filter-service.spec.ts +1 -1
- package/src/browser/workspace-service.spec.ts +508 -0
- package/src/browser/workspace-service.ts +353 -44
- package/src/browser/workspace-storage-service.ts +1 -1
- package/src/browser/workspace-trust-service.spec.ts +2 -2
- package/src/browser/workspace-trust-service.ts +5 -5
- package/src/browser/workspace-uri-contribution.spec.ts +76 -6
- package/src/browser/workspace-uri-contribution.ts +61 -4
- package/src/browser/workspace-user-working-directory-provider.ts +1 -1
- package/src/browser/workspace-utils.ts +1 -1
- package/src/browser/workspace-variable-contribution.ts +1 -1
- package/src/browser/workspace-window-title-updater.ts +1 -1
- package/src/browser-only/browser-only-workspace-server.ts +1 -1
- package/src/browser-only/workspace-frontend-only-module.ts +2 -2
- package/src/common/index.ts +4 -4
- package/src/common/test/mock-workspace-server.ts +1 -1
- package/src/common/untitled-workspace-service.ts +1 -1
- package/src/electron-browser/electron-workspace-contribution.ts +1 -1
- package/src/electron-browser/electron-workspace-module.ts +1 -1
- package/src/node/default-workspace-server.spec.ts +2 -2
- package/src/node/default-workspace-server.ts +1 -1
- package/src/node/index.ts +2 -2
- package/src/node/workspace-backend-module.ts +3 -3
- package/src/typings/valid-filename.d.ts +20 -0
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
// *****************************************************************************
|
|
3
2
|
// Copyright (C) 2026 EclipseSource GmbH.
|
|
4
3
|
//
|
|
@@ -14,14 +13,13 @@
|
|
|
14
13
|
//
|
|
15
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
16
15
|
// *****************************************************************************
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
class TestableWorkspaceTrustService extends workspace_trust_service_1.WorkspaceTrustService {
|
|
16
|
+
import { expect } from 'chai';
|
|
17
|
+
import * as sinon from 'sinon';
|
|
18
|
+
import { PreferenceScope } from '@theia/core/lib/common/preferences';
|
|
19
|
+
import { WorkspaceTrustService } from './workspace-trust-service.js';
|
|
20
|
+
import { WORKSPACE_TRUST_EMPTY_WINDOW, WORKSPACE_TRUST_ENABLED, WORKSPACE_TRUST_STARTUP_PROMPT, WORKSPACE_TRUST_TRUSTED_FOLDERS, WorkspaceTrustPrompt } from '../common/workspace-trust-preferences.js';
|
|
21
|
+
import URI from '@theia/core/lib/common/uri';
|
|
22
|
+
class TestableWorkspaceTrustService extends WorkspaceTrustService {
|
|
25
23
|
async testHandlePreferenceChange(change) {
|
|
26
24
|
return this.handlePreferenceChange(change);
|
|
27
25
|
}
|
|
@@ -62,10 +60,10 @@ describe('WorkspaceTrustService', () => {
|
|
|
62
60
|
let envVariablesServerStub;
|
|
63
61
|
beforeEach(() => {
|
|
64
62
|
workspaceTrustPrefStub = {
|
|
65
|
-
[
|
|
66
|
-
[
|
|
67
|
-
[
|
|
68
|
-
[
|
|
63
|
+
[WORKSPACE_TRUST_ENABLED]: true,
|
|
64
|
+
[WORKSPACE_TRUST_EMPTY_WINDOW]: false,
|
|
65
|
+
[WORKSPACE_TRUST_STARTUP_PROMPT]: WorkspaceTrustPrompt.NEVER,
|
|
66
|
+
[WORKSPACE_TRUST_TRUSTED_FOLDERS]: []
|
|
69
67
|
};
|
|
70
68
|
workspaceServiceStub = {
|
|
71
69
|
tryGetRoots: () => [],
|
|
@@ -84,124 +82,124 @@ describe('WorkspaceTrustService', () => {
|
|
|
84
82
|
service.envVariablesServer = envVariablesServerStub;
|
|
85
83
|
});
|
|
86
84
|
it('should return true when trust is disabled', async () => {
|
|
87
|
-
workspaceTrustPrefStub[
|
|
88
|
-
|
|
85
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_ENABLED] = false;
|
|
86
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
89
87
|
});
|
|
90
88
|
describe('empty workspace', () => {
|
|
91
89
|
it('should return emptyWindow setting when no workspace is open', async () => {
|
|
92
90
|
workspaceServiceStub.workspace = undefined;
|
|
93
|
-
workspaceTrustPrefStub[
|
|
94
|
-
|
|
91
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = true;
|
|
92
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
95
93
|
});
|
|
96
94
|
it('should return false when emptyWindow is false and no workspace', async () => {
|
|
97
95
|
workspaceServiceStub.workspace = undefined;
|
|
98
|
-
workspaceTrustPrefStub[
|
|
99
|
-
|
|
96
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = false;
|
|
97
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.false;
|
|
100
98
|
});
|
|
101
99
|
it('should return emptyWindow setting for untitled workspace with no folders', async () => {
|
|
102
|
-
workspaceServiceStub.workspace = { resource: new
|
|
100
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/.theia/workspaces/Untitled-123.theia-workspace') };
|
|
103
101
|
workspaceServiceStub.tryGetRoots = () => [];
|
|
104
102
|
untitledWorkspaceServiceStub.isUntitledWorkspace = () => true;
|
|
105
|
-
workspaceTrustPrefStub[
|
|
106
|
-
|
|
103
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = true;
|
|
104
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
107
105
|
});
|
|
108
106
|
it('should not treat saved workspace with no folders as empty', async () => {
|
|
109
|
-
workspaceServiceStub.workspace = { resource: new
|
|
107
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/my.theia-workspace') };
|
|
110
108
|
workspaceServiceStub.tryGetRoots = () => [];
|
|
111
109
|
workspaceServiceStub.saved = true;
|
|
112
110
|
untitledWorkspaceServiceStub.isUntitledWorkspace = () => false;
|
|
113
|
-
workspaceTrustPrefStub[
|
|
111
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = true;
|
|
114
112
|
// Should return false because saved workspace with 0 folders is not "empty"
|
|
115
113
|
// and the workspace file is not trusted
|
|
116
|
-
|
|
114
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.false;
|
|
117
115
|
});
|
|
118
116
|
});
|
|
119
117
|
describe('single-root workspace', () => {
|
|
120
118
|
it('should return true when folder is in trusted folders', async () => {
|
|
121
|
-
workspaceTrustPrefStub[
|
|
122
|
-
workspaceServiceStub.workspace = { resource: new
|
|
119
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project'];
|
|
120
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/project') };
|
|
123
121
|
workspaceServiceStub.tryGetRoots = () => [
|
|
124
|
-
{ resource: new
|
|
122
|
+
{ resource: new URI('file:///home/user/project') }
|
|
125
123
|
];
|
|
126
|
-
|
|
124
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
127
125
|
});
|
|
128
126
|
it('should return true when parent folder is trusted', async () => {
|
|
129
|
-
workspaceTrustPrefStub[
|
|
130
|
-
workspaceServiceStub.workspace = { resource: new
|
|
127
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user'];
|
|
128
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/project') };
|
|
131
129
|
workspaceServiceStub.tryGetRoots = () => [
|
|
132
|
-
{ resource: new
|
|
130
|
+
{ resource: new URI('file:///home/user/project') }
|
|
133
131
|
];
|
|
134
|
-
|
|
132
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
135
133
|
});
|
|
136
134
|
it('should return false when folder is not trusted', async () => {
|
|
137
|
-
workspaceTrustPrefStub[
|
|
138
|
-
workspaceServiceStub.workspace = { resource: new
|
|
135
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/other'];
|
|
136
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/project') };
|
|
139
137
|
workspaceServiceStub.tryGetRoots = () => [
|
|
140
|
-
{ resource: new
|
|
138
|
+
{ resource: new URI('file:///home/user/project') }
|
|
141
139
|
];
|
|
142
|
-
|
|
140
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.false;
|
|
143
141
|
});
|
|
144
142
|
});
|
|
145
143
|
describe('multi-root workspace', () => {
|
|
146
144
|
it('should return true when all folders are trusted', async () => {
|
|
147
|
-
workspaceTrustPrefStub[
|
|
145
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = [
|
|
148
146
|
'file:///home/user/project1',
|
|
149
147
|
'file:///home/user/project2'
|
|
150
148
|
];
|
|
151
|
-
workspaceServiceStub.workspace = { resource: new
|
|
149
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/my.theia-workspace') };
|
|
152
150
|
workspaceServiceStub.tryGetRoots = () => [
|
|
153
|
-
{ resource: new
|
|
154
|
-
{ resource: new
|
|
151
|
+
{ resource: new URI('file:///home/user/project1') },
|
|
152
|
+
{ resource: new URI('file:///home/user/project2') }
|
|
155
153
|
];
|
|
156
|
-
|
|
154
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
157
155
|
});
|
|
158
156
|
it('should return false when one folder is not trusted', async () => {
|
|
159
|
-
workspaceTrustPrefStub[
|
|
160
|
-
workspaceServiceStub.workspace = { resource: new
|
|
157
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project1'];
|
|
158
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/my.theia-workspace') };
|
|
161
159
|
workspaceServiceStub.tryGetRoots = () => [
|
|
162
|
-
{ resource: new
|
|
163
|
-
{ resource: new
|
|
160
|
+
{ resource: new URI('file:///home/user/project1') },
|
|
161
|
+
{ resource: new URI('file:///home/user/project2') }
|
|
164
162
|
];
|
|
165
|
-
|
|
163
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.false;
|
|
166
164
|
});
|
|
167
165
|
it('should return true when parent folder covers all roots', async () => {
|
|
168
|
-
workspaceTrustPrefStub[
|
|
169
|
-
workspaceServiceStub.workspace = { resource: new
|
|
166
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user'];
|
|
167
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/my.theia-workspace') };
|
|
170
168
|
workspaceServiceStub.tryGetRoots = () => [
|
|
171
|
-
{ resource: new
|
|
172
|
-
{ resource: new
|
|
169
|
+
{ resource: new URI('file:///home/user/project1') },
|
|
170
|
+
{ resource: new URI('file:///home/user/project2') }
|
|
173
171
|
];
|
|
174
|
-
|
|
172
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
175
173
|
});
|
|
176
174
|
});
|
|
177
175
|
describe('saved workspace file trust', () => {
|
|
178
176
|
it('should require workspace file to be trusted for saved workspaces', async () => {
|
|
179
177
|
// Folder is trusted but workspace file location is not
|
|
180
|
-
workspaceTrustPrefStub[
|
|
181
|
-
workspaceServiceStub.workspace = { resource: new
|
|
178
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project'];
|
|
179
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///other/location/my.theia-workspace') };
|
|
182
180
|
workspaceServiceStub.saved = true;
|
|
183
181
|
workspaceServiceStub.tryGetRoots = () => [
|
|
184
|
-
{ resource: new
|
|
182
|
+
{ resource: new URI('file:///home/user/project') }
|
|
185
183
|
];
|
|
186
|
-
|
|
184
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.false;
|
|
187
185
|
});
|
|
188
186
|
it('should return true when both folder and workspace file are trusted', async () => {
|
|
189
|
-
workspaceTrustPrefStub[
|
|
190
|
-
workspaceServiceStub.workspace = { resource: new
|
|
187
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user'];
|
|
188
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///home/user/my.theia-workspace') };
|
|
191
189
|
workspaceServiceStub.saved = true;
|
|
192
190
|
workspaceServiceStub.tryGetRoots = () => [
|
|
193
|
-
{ resource: new
|
|
191
|
+
{ resource: new URI('file:///home/user/project') }
|
|
194
192
|
];
|
|
195
|
-
|
|
193
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
196
194
|
});
|
|
197
195
|
it('should not require workspace file trust for unsaved workspaces', async () => {
|
|
198
|
-
workspaceTrustPrefStub[
|
|
199
|
-
workspaceServiceStub.workspace = { resource: new
|
|
196
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_TRUSTED_FOLDERS] = ['file:///home/user/project'];
|
|
197
|
+
workspaceServiceStub.workspace = { resource: new URI('file:///tmp/untitled.theia-workspace') };
|
|
200
198
|
workspaceServiceStub.saved = false;
|
|
201
199
|
workspaceServiceStub.tryGetRoots = () => [
|
|
202
|
-
{ resource: new
|
|
200
|
+
{ resource: new URI('file:///home/user/project') }
|
|
203
201
|
];
|
|
204
|
-
|
|
202
|
+
expect(await service.testCalculateWorkspaceTrust()).to.be.true;
|
|
205
203
|
});
|
|
206
204
|
});
|
|
207
205
|
});
|
|
@@ -217,24 +215,24 @@ describe('WorkspaceTrustService', () => {
|
|
|
217
215
|
it('should reset trust state when workspace changes', async () => {
|
|
218
216
|
service.setCurrentTrust(true);
|
|
219
217
|
await service.testHandleWorkspaceChanged();
|
|
220
|
-
|
|
218
|
+
expect(service.getCurrentTrust()).to.be.undefined;
|
|
221
219
|
});
|
|
222
220
|
it('should re-evaluate trust when workspace changes', async () => {
|
|
223
221
|
service.setCurrentTrust(true);
|
|
224
222
|
await service.testHandleWorkspaceChanged();
|
|
225
|
-
|
|
223
|
+
expect(resolveWorkspaceTrustStub.calledOnce).to.be.true;
|
|
226
224
|
});
|
|
227
225
|
it('should update restricted mode indicator after workspace change if not trusted', async () => {
|
|
228
226
|
getWorkspaceTrustStub.resolves(false);
|
|
229
227
|
await service.testHandleWorkspaceChanged();
|
|
230
|
-
|
|
228
|
+
expect(updateRestrictedModeIndicatorStub.calledOnceWith(false)).to.be.true;
|
|
231
229
|
});
|
|
232
230
|
it('should reset workspaceTrust deferred to unresolved state', async () => {
|
|
233
231
|
// First resolve the trust
|
|
234
232
|
service.setCurrentTrust(true);
|
|
235
233
|
await service.testHandleWorkspaceChanged();
|
|
236
234
|
// After workspace change, it should be reset and resolved again via resolveWorkspaceTrust
|
|
237
|
-
|
|
235
|
+
expect(resolveWorkspaceTrustStub.calledOnce).to.be.true;
|
|
238
236
|
});
|
|
239
237
|
});
|
|
240
238
|
describe('handlePreferenceChange', () => {
|
|
@@ -248,7 +246,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
248
246
|
isEmptyWorkspaceStub = sinon.stub(service, 'isEmptyWorkspace');
|
|
249
247
|
// Mock workspaceTrustPref - default emptyWindow to false so trusted folders logic runs;
|
|
250
248
|
// trust is enabled by default so the trustedFolders branch is exercised
|
|
251
|
-
workspaceTrustPrefStub = { [
|
|
249
|
+
workspaceTrustPrefStub = { [WORKSPACE_TRUST_EMPTY_WINDOW]: false, [WORKSPACE_TRUST_ENABLED]: true };
|
|
252
250
|
service.workspaceTrustPref = workspaceTrustPrefStub;
|
|
253
251
|
// Default to non-empty workspace
|
|
254
252
|
isEmptyWorkspaceStub.resolves(false);
|
|
@@ -257,37 +255,37 @@ describe('WorkspaceTrustService', () => {
|
|
|
257
255
|
service.setCurrentTrust(false);
|
|
258
256
|
areAllWorkspaceUrisTrustedStub.resolves(true);
|
|
259
257
|
const change = {
|
|
260
|
-
preferenceName:
|
|
261
|
-
scope:
|
|
258
|
+
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
259
|
+
scope: PreferenceScope.User,
|
|
262
260
|
domain: [],
|
|
263
261
|
affects: () => true
|
|
264
262
|
};
|
|
265
263
|
await service.testHandlePreferenceChange(change);
|
|
266
|
-
|
|
264
|
+
expect(setWorkspaceTrustStub.calledOnceWith(true)).to.be.true;
|
|
267
265
|
});
|
|
268
266
|
it('should update trust to false when not all workspace URIs are trusted', async () => {
|
|
269
267
|
service.setCurrentTrust(true);
|
|
270
268
|
areAllWorkspaceUrisTrustedStub.resolves(false);
|
|
271
269
|
const change = {
|
|
272
|
-
preferenceName:
|
|
273
|
-
scope:
|
|
270
|
+
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
271
|
+
scope: PreferenceScope.User,
|
|
274
272
|
domain: [],
|
|
275
273
|
affects: () => true
|
|
276
274
|
};
|
|
277
275
|
await service.testHandlePreferenceChange(change);
|
|
278
|
-
|
|
276
|
+
expect(setWorkspaceTrustStub.calledOnceWith(false)).to.be.true;
|
|
279
277
|
});
|
|
280
278
|
it('should not update trust when trustedFolders change does not affect trust status', async () => {
|
|
281
279
|
service.setCurrentTrust(false);
|
|
282
280
|
areAllWorkspaceUrisTrustedStub.resolves(false);
|
|
283
281
|
const change = {
|
|
284
|
-
preferenceName:
|
|
285
|
-
scope:
|
|
282
|
+
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
283
|
+
scope: PreferenceScope.User,
|
|
286
284
|
domain: [],
|
|
287
285
|
affects: () => true
|
|
288
286
|
};
|
|
289
287
|
await service.testHandlePreferenceChange(change);
|
|
290
|
-
|
|
288
|
+
expect(setWorkspaceTrustStub.called).to.be.false;
|
|
291
289
|
});
|
|
292
290
|
describe('emptyWindow setting changes', () => {
|
|
293
291
|
beforeEach(() => {
|
|
@@ -296,50 +294,50 @@ describe('WorkspaceTrustService', () => {
|
|
|
296
294
|
});
|
|
297
295
|
it('should update trust to true when emptyWindow setting changes to true for empty window', async () => {
|
|
298
296
|
service.setCurrentTrust(false);
|
|
299
|
-
workspaceTrustPrefStub[
|
|
297
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = true;
|
|
300
298
|
const change = {
|
|
301
|
-
preferenceName:
|
|
302
|
-
scope:
|
|
299
|
+
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
300
|
+
scope: PreferenceScope.User,
|
|
303
301
|
domain: [],
|
|
304
302
|
affects: () => true
|
|
305
303
|
};
|
|
306
304
|
await service.testHandlePreferenceChange(change);
|
|
307
|
-
|
|
305
|
+
expect(setWorkspaceTrustStub.calledOnceWith(true, false)).to.be.true;
|
|
308
306
|
});
|
|
309
307
|
it('should update trust to false when emptyWindow setting changes to false for empty window', async () => {
|
|
310
308
|
service.setCurrentTrust(true);
|
|
311
309
|
const change = {
|
|
312
|
-
preferenceName:
|
|
313
|
-
scope:
|
|
310
|
+
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
311
|
+
scope: PreferenceScope.User,
|
|
314
312
|
domain: [],
|
|
315
313
|
affects: () => true
|
|
316
314
|
};
|
|
317
315
|
await service.testHandlePreferenceChange(change);
|
|
318
|
-
|
|
316
|
+
expect(setWorkspaceTrustStub.calledOnceWith(false, false)).to.be.true;
|
|
319
317
|
});
|
|
320
318
|
it('should not update trust when emptyWindow setting changes but workspace has roots', async () => {
|
|
321
319
|
service.setCurrentTrust(false);
|
|
322
320
|
isEmptyWorkspaceStub.resolves(false);
|
|
323
321
|
const change = {
|
|
324
|
-
preferenceName:
|
|
325
|
-
scope:
|
|
322
|
+
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
323
|
+
scope: PreferenceScope.User,
|
|
326
324
|
domain: [],
|
|
327
325
|
affects: () => true
|
|
328
326
|
};
|
|
329
327
|
await service.testHandlePreferenceChange(change);
|
|
330
|
-
|
|
328
|
+
expect(setWorkspaceTrustStub.called).to.be.false;
|
|
331
329
|
});
|
|
332
330
|
it('should not update trust when emptyWindow setting changes but trust already matches', async () => {
|
|
333
331
|
service.setCurrentTrust(true);
|
|
334
|
-
workspaceTrustPrefStub[
|
|
332
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = true;
|
|
335
333
|
const change = {
|
|
336
|
-
preferenceName:
|
|
337
|
-
scope:
|
|
334
|
+
preferenceName: WORKSPACE_TRUST_EMPTY_WINDOW,
|
|
335
|
+
scope: PreferenceScope.User,
|
|
338
336
|
domain: [],
|
|
339
337
|
affects: () => true
|
|
340
338
|
};
|
|
341
339
|
await service.testHandlePreferenceChange(change);
|
|
342
|
-
|
|
340
|
+
expect(setWorkspaceTrustStub.called).to.be.false;
|
|
343
341
|
});
|
|
344
342
|
});
|
|
345
343
|
describe('workspaceTrustEnabled setting changes', () => {
|
|
@@ -355,79 +353,79 @@ describe('WorkspaceTrustService', () => {
|
|
|
355
353
|
service.setCurrentTrust(true);
|
|
356
354
|
// Simulate a real user change: effective value just flipped from true to false.
|
|
357
355
|
service.setLastKnownTrustEnabled(true);
|
|
358
|
-
workspaceTrustPrefStub[
|
|
356
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_ENABLED] = false;
|
|
359
357
|
});
|
|
360
358
|
it('should reload without setSafeToShutDown when user confirms restart', async () => {
|
|
361
359
|
confirmRestartStub.resolves(true);
|
|
362
360
|
const change = {
|
|
363
|
-
preferenceName:
|
|
364
|
-
scope:
|
|
361
|
+
preferenceName: WORKSPACE_TRUST_ENABLED,
|
|
362
|
+
scope: PreferenceScope.User,
|
|
365
363
|
domain: [],
|
|
366
364
|
affects: () => true
|
|
367
365
|
};
|
|
368
366
|
await service.testHandlePreferenceChange(change);
|
|
369
|
-
|
|
370
|
-
|
|
367
|
+
expect(windowServiceStub.reload.calledOnce).to.be.true;
|
|
368
|
+
expect(windowServiceStub.setSafeToShutDown.called).to.be.false;
|
|
371
369
|
});
|
|
372
370
|
it('should not reload when user cancels restart', async () => {
|
|
373
371
|
confirmRestartStub.resolves(false);
|
|
374
372
|
const change = {
|
|
375
|
-
preferenceName:
|
|
376
|
-
scope:
|
|
373
|
+
preferenceName: WORKSPACE_TRUST_ENABLED,
|
|
374
|
+
scope: PreferenceScope.User,
|
|
377
375
|
domain: [],
|
|
378
376
|
affects: () => true
|
|
379
377
|
};
|
|
380
378
|
await service.testHandlePreferenceChange(change);
|
|
381
|
-
|
|
382
|
-
|
|
379
|
+
expect(windowServiceStub.reload.called).to.be.false;
|
|
380
|
+
expect(windowServiceStub.setSafeToShutDown.called).to.be.false;
|
|
383
381
|
});
|
|
384
382
|
it('should not show restart dialog when effective value is unchanged (initial-load event)', async () => {
|
|
385
383
|
// Simulate the User provider's initial-load event: value already matches what was
|
|
386
384
|
// observed at trust resolution time.
|
|
387
385
|
service.setLastKnownTrustEnabled(false);
|
|
388
|
-
workspaceTrustPrefStub[
|
|
386
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_ENABLED] = false;
|
|
389
387
|
const change = {
|
|
390
|
-
preferenceName:
|
|
391
|
-
scope:
|
|
388
|
+
preferenceName: WORKSPACE_TRUST_ENABLED,
|
|
389
|
+
scope: PreferenceScope.User,
|
|
392
390
|
domain: [],
|
|
393
391
|
affects: () => true
|
|
394
392
|
};
|
|
395
393
|
await service.testHandlePreferenceChange(change);
|
|
396
|
-
|
|
397
|
-
|
|
394
|
+
expect(confirmRestartStub.called).to.be.false;
|
|
395
|
+
expect(windowServiceStub.reload.called).to.be.false;
|
|
398
396
|
});
|
|
399
397
|
});
|
|
400
398
|
describe('trustedFolders change while trust is disabled', () => {
|
|
401
399
|
it('should not flip currentTrust when `enabled` is false', async () => {
|
|
402
|
-
workspaceTrustPrefStub[
|
|
400
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_ENABLED] = false;
|
|
403
401
|
service.setCurrentTrust(true);
|
|
404
402
|
areAllWorkspaceUrisTrustedStub.resolves(false);
|
|
405
403
|
const change = {
|
|
406
|
-
preferenceName:
|
|
407
|
-
scope:
|
|
404
|
+
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
405
|
+
scope: PreferenceScope.User,
|
|
408
406
|
domain: [],
|
|
409
407
|
affects: () => true
|
|
410
408
|
};
|
|
411
409
|
await service.testHandlePreferenceChange(change);
|
|
412
|
-
|
|
413
|
-
|
|
410
|
+
expect(setWorkspaceTrustStub.called).to.be.false;
|
|
411
|
+
expect(areAllWorkspaceUrisTrustedStub.called).to.be.false;
|
|
414
412
|
});
|
|
415
413
|
});
|
|
416
414
|
describe('trustedFolders change for empty window with emptyWindow enabled', () => {
|
|
417
415
|
beforeEach(() => {
|
|
418
416
|
isEmptyWorkspaceStub.resolves(true);
|
|
419
|
-
workspaceTrustPrefStub[
|
|
417
|
+
workspaceTrustPrefStub[WORKSPACE_TRUST_EMPTY_WINDOW] = true;
|
|
420
418
|
});
|
|
421
419
|
it('should not change trust when trustedFolders change for empty window with emptyWindow enabled', async () => {
|
|
422
420
|
service.setCurrentTrust(true);
|
|
423
421
|
const change = {
|
|
424
|
-
preferenceName:
|
|
425
|
-
scope:
|
|
422
|
+
preferenceName: WORKSPACE_TRUST_TRUSTED_FOLDERS,
|
|
423
|
+
scope: PreferenceScope.User,
|
|
426
424
|
domain: [],
|
|
427
425
|
affects: () => true
|
|
428
426
|
};
|
|
429
427
|
await service.testHandlePreferenceChange(change);
|
|
430
|
-
|
|
428
|
+
expect(setWorkspaceTrustStub.called).to.be.false;
|
|
431
429
|
});
|
|
432
430
|
});
|
|
433
431
|
});
|
|
@@ -457,16 +455,16 @@ describe('WorkspaceTrustService', () => {
|
|
|
457
455
|
service.setCurrentTrust(false);
|
|
458
456
|
shouldReloadStub.returns(false);
|
|
459
457
|
await service.setWorkspaceTrust(true);
|
|
460
|
-
|
|
461
|
-
|
|
462
|
-
|
|
458
|
+
expect(service.getCurrentTrust()).to.equal(true);
|
|
459
|
+
expect(contextKeyServiceStub.setContext.calledWith('isWorkspaceTrusted', true)).to.be.true;
|
|
460
|
+
expect(onDidChangeEmitterStub.fire.calledWith(true)).to.be.true;
|
|
463
461
|
});
|
|
464
462
|
it('should be a no-op when trust value does not change', async () => {
|
|
465
463
|
service.setCurrentTrust(true);
|
|
466
464
|
await service.setWorkspaceTrust(true);
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
465
|
+
expect(contextKeyServiceStub.setContext.called).to.be.false;
|
|
466
|
+
expect(onDidChangeEmitterStub.fire.called).to.be.false;
|
|
467
|
+
expect(storeWorkspaceTrustStub.called).to.be.false;
|
|
470
468
|
});
|
|
471
469
|
it('should confirm restart before storing or firing events when reload is required', async () => {
|
|
472
470
|
const callOrder = [];
|
|
@@ -484,74 +482,74 @@ describe('WorkspaceTrustService', () => {
|
|
|
484
482
|
shouldReloadStub.returns(true);
|
|
485
483
|
service.setCurrentTrust(false);
|
|
486
484
|
await service.setWorkspaceTrust(true);
|
|
487
|
-
|
|
488
|
-
|
|
489
|
-
|
|
485
|
+
expect(callOrder[0]).to.equal('confirm');
|
|
486
|
+
expect(callOrder).to.include('store');
|
|
487
|
+
expect(callOrder).to.include('fire');
|
|
490
488
|
});
|
|
491
489
|
it('should call windowService.reload() when shouldReloadForTrustChange returns true', async () => {
|
|
492
490
|
shouldReloadStub.returns(true);
|
|
493
491
|
service.setCurrentTrust(false);
|
|
494
492
|
await service.setWorkspaceTrust(true);
|
|
495
|
-
|
|
493
|
+
expect(windowServiceStub.reload.calledOnce).to.be.true;
|
|
496
494
|
});
|
|
497
495
|
it('should NOT call windowService.reload() when shouldReloadForTrustChange returns false', async () => {
|
|
498
496
|
shouldReloadStub.returns(false);
|
|
499
497
|
service.setCurrentTrust(false);
|
|
500
498
|
await service.setWorkspaceTrust(true);
|
|
501
|
-
|
|
499
|
+
expect(windowServiceStub.reload.called).to.be.false;
|
|
502
500
|
});
|
|
503
501
|
it('should NOT call setSafeToShutDown (unsaved-changes protection preserved)', async () => {
|
|
504
502
|
shouldReloadStub.returns(true);
|
|
505
503
|
service.setCurrentTrust(false);
|
|
506
504
|
await service.setWorkspaceTrust(true);
|
|
507
|
-
|
|
505
|
+
expect(windowServiceStub.setSafeToShutDown.called).to.be.false;
|
|
508
506
|
});
|
|
509
507
|
it('should NOT call windowService.reload() when user cancels confirm dialog', async () => {
|
|
510
508
|
shouldReloadStub.returns(true);
|
|
511
509
|
confirmRestartStub.resolves(false);
|
|
512
510
|
service.setCurrentTrust(false);
|
|
513
511
|
await service.setWorkspaceTrust(true);
|
|
514
|
-
|
|
512
|
+
expect(windowServiceStub.reload.called).to.be.false;
|
|
515
513
|
});
|
|
516
514
|
it('should leave trust state unchanged and not fire events when user cancels the restart dialog', async () => {
|
|
517
515
|
shouldReloadStub.returns(true);
|
|
518
516
|
confirmRestartStub.resolves(false);
|
|
519
517
|
service.setCurrentTrust(false);
|
|
520
518
|
await service.setWorkspaceTrust(true);
|
|
521
|
-
|
|
522
|
-
|
|
523
|
-
|
|
524
|
-
|
|
525
|
-
|
|
526
|
-
|
|
519
|
+
expect(service.getCurrentTrust()).to.equal(false);
|
|
520
|
+
expect(contextKeyServiceStub.setContext.called).to.be.false;
|
|
521
|
+
expect(onDidChangeEmitterStub.fire.called).to.be.false;
|
|
522
|
+
expect(storeWorkspaceTrustStub.called).to.be.false;
|
|
523
|
+
expect(addToTrustedFoldersStub.called).to.be.false;
|
|
524
|
+
expect(removeFromTrustedFoldersStub.called).to.be.false;
|
|
527
525
|
});
|
|
528
526
|
it('should call addToTrustedFolders when setting trusted=true', async () => {
|
|
529
527
|
shouldReloadStub.returns(false);
|
|
530
528
|
service.setCurrentTrust(false);
|
|
531
529
|
await service.setWorkspaceTrust(true);
|
|
532
|
-
|
|
533
|
-
|
|
530
|
+
expect(addToTrustedFoldersStub.calledOnce).to.be.true;
|
|
531
|
+
expect(removeFromTrustedFoldersStub.called).to.be.false;
|
|
534
532
|
});
|
|
535
533
|
it('should call removeFromTrustedFolders when setting trusted=false', async () => {
|
|
536
534
|
shouldReloadStub.returns(false);
|
|
537
535
|
service.setCurrentTrust(true);
|
|
538
536
|
await service.setWorkspaceTrust(false);
|
|
539
|
-
|
|
540
|
-
|
|
537
|
+
expect(removeFromTrustedFoldersStub.calledOnce).to.be.true;
|
|
538
|
+
expect(addToTrustedFoldersStub.called).to.be.false;
|
|
541
539
|
});
|
|
542
540
|
it('should NOT reload when reload=false even if shouldReloadForTrustChange returns true', async () => {
|
|
543
541
|
shouldReloadStub.returns(true);
|
|
544
542
|
service.setCurrentTrust(false);
|
|
545
543
|
await service.setWorkspaceTrust(true, false);
|
|
546
|
-
|
|
544
|
+
expect(windowServiceStub.reload.called).to.be.false;
|
|
547
545
|
});
|
|
548
546
|
it('should still update state and fire event when reload=false', async () => {
|
|
549
547
|
service.setCurrentTrust(false);
|
|
550
548
|
shouldReloadStub.returns(true);
|
|
551
549
|
await service.setWorkspaceTrust(true, false);
|
|
552
|
-
|
|
553
|
-
|
|
554
|
-
|
|
550
|
+
expect(service.getCurrentTrust()).to.equal(true);
|
|
551
|
+
expect(contextKeyServiceStub.setContext.calledWith('isWorkspaceTrusted', true)).to.be.true;
|
|
552
|
+
expect(onDidChangeEmitterStub.fire.calledWith(true)).to.be.true;
|
|
555
553
|
});
|
|
556
554
|
});
|
|
557
555
|
describe('shouldReloadForTrustChange', () => {
|
|
@@ -562,12 +560,12 @@ describe('WorkspaceTrustService', () => {
|
|
|
562
560
|
it('should return false when no restriction contributions are registered', () => {
|
|
563
561
|
freshService
|
|
564
562
|
.restrictionContributions = { getContributions: () => [] };
|
|
565
|
-
|
|
563
|
+
expect(freshService.testShouldReloadForTrustChange(true)).to.be.false;
|
|
566
564
|
});
|
|
567
565
|
it('should return false when contribution does not implement requiresReloadOnTrustChange', () => {
|
|
568
566
|
freshService
|
|
569
567
|
.restrictionContributions = { getContributions: () => [{ getRestrictions: () => [] }] };
|
|
570
|
-
|
|
568
|
+
expect(freshService.testShouldReloadForTrustChange(true)).to.be.false;
|
|
571
569
|
});
|
|
572
570
|
it('should return true when a contribution requires reload for the given trust value', () => {
|
|
573
571
|
freshService
|
|
@@ -577,7 +575,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
577
575
|
requiresReloadOnTrustChange: (_newTrust) => true
|
|
578
576
|
}]
|
|
579
577
|
};
|
|
580
|
-
|
|
578
|
+
expect(freshService.testShouldReloadForTrustChange(true)).to.be.true;
|
|
581
579
|
});
|
|
582
580
|
it('should return false when contribution returns false for requiresReloadOnTrustChange', () => {
|
|
583
581
|
freshService
|
|
@@ -587,7 +585,7 @@ describe('WorkspaceTrustService', () => {
|
|
|
587
585
|
requiresReloadOnTrustChange: (_newTrust) => false
|
|
588
586
|
}]
|
|
589
587
|
};
|
|
590
|
-
|
|
588
|
+
expect(freshService.testShouldReloadForTrustChange(true)).to.be.false;
|
|
591
589
|
});
|
|
592
590
|
it('should pass newTrust value to requiresReloadOnTrustChange', () => {
|
|
593
591
|
const calls = [];
|
|
@@ -599,9 +597,9 @@ describe('WorkspaceTrustService', () => {
|
|
|
599
597
|
}]
|
|
600
598
|
};
|
|
601
599
|
freshService.testShouldReloadForTrustChange(false);
|
|
602
|
-
|
|
600
|
+
expect(calls).to.deep.equal([false]);
|
|
603
601
|
freshService.testShouldReloadForTrustChange(true);
|
|
604
|
-
|
|
602
|
+
expect(calls).to.deep.equal([false, true]);
|
|
605
603
|
});
|
|
606
604
|
});
|
|
607
605
|
});
|