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