Skip to content

Commit e0cbc9a

Browse files
authored
Use new feedback setting (#24929)
Due to microsoft/vscode#244677
1 parent 725d539 commit e0cbc9a

File tree

2 files changed

+24
-7
lines changed

2 files changed

+24
-7
lines changed

src/client/activation/extensionSurvey.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ export class ExtensionSurveyPrompt implements IExtensionSingleActivationService
5959
return false;
6060
}
6161

62-
let feedbackDisabled = false;
62+
let feedbackEnabled = true;
6363

6464
const telemetryConfig = this.workspace.getConfiguration('telemetry');
6565
if (telemetryConfig) {
66-
feedbackDisabled = telemetryConfig.get<boolean>('disableFeedback', false);
66+
feedbackEnabled = telemetryConfig.get<boolean>('feedback.enabled', true);
6767
}
6868

69-
if (feedbackDisabled) {
69+
if (!feedbackEnabled) {
7070
return false;
7171
}
7272

src/test/activation/extensionSurvey.unit.test.ts

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,21 +127,38 @@ suite('Extension survey prompt - shouldShowBanner()', () => {
127127
}
128128
random.verifyAll();
129129
});
130-
test('Returns false if telemetry.disableFeedback is enabled', async () => {
130+
test('Returns true if telemetry.feedback.enabled is enabled', async () => {
131131
disableSurveyForTime.setup((d) => d.value).returns(() => false);
132132
doNotShowAgain.setup((d) => d.value).returns(() => false);
133133

134134
const telemetryConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
135135
workspaceService.setup((w) => w.getConfiguration('telemetry')).returns(() => telemetryConfig.object);
136136
telemetryConfig
137-
.setup((t) => t.get(TypeMoq.It.isValue('disableFeedback'), TypeMoq.It.isValue(false)))
137+
.setup((t) => t.get(TypeMoq.It.isValue('feedback.enabled'), TypeMoq.It.isValue(true)))
138138
.returns(() => true);
139139

140140
const result = extensionSurveyPrompt.shouldShowBanner();
141141

142-
expect(result).to.equal(false, 'Banner should not be shown when telemetry.disableFeedback is true');
142+
expect(result).to.equal(true, 'Banner should be shown when telemetry.feedback.enabled is true');
143143
workspaceService.verify((w) => w.getConfiguration('telemetry'), TypeMoq.Times.once());
144-
telemetryConfig.verify((t) => t.get('disableFeedback', false), TypeMoq.Times.once());
144+
telemetryConfig.verify((t) => t.get('feedback.enabled', true), TypeMoq.Times.once());
145+
});
146+
147+
test('Returns false if telemetry.feedback.enabled is disabled', async () => {
148+
disableSurveyForTime.setup((d) => d.value).returns(() => false);
149+
doNotShowAgain.setup((d) => d.value).returns(() => false);
150+
151+
const telemetryConfig = TypeMoq.Mock.ofType<WorkspaceConfiguration>();
152+
workspaceService.setup((w) => w.getConfiguration('telemetry')).returns(() => telemetryConfig.object);
153+
telemetryConfig
154+
.setup((t) => t.get(TypeMoq.It.isValue('feedback.enabled'), TypeMoq.It.isValue(true)))
155+
.returns(() => false);
156+
157+
const result = extensionSurveyPrompt.shouldShowBanner();
158+
159+
expect(result).to.equal(false, 'Banner should not be shown when feedback.enabled is false');
160+
workspaceService.verify((w) => w.getConfiguration('telemetry'), TypeMoq.Times.once());
161+
telemetryConfig.verify((t) => t.get('feedback.enabled', true), TypeMoq.Times.once());
145162
});
146163

147164
test('Returns true if user is in the random sampling', async () => {

0 commit comments

Comments
 (0)