From fa66e42134262c8f6851818dd01749d113b9f509 Mon Sep 17 00:00:00 2001 From: Rob Lourens Date: Fri, 7 Dec 2018 12:45:08 -0800 Subject: [PATCH] Remove TPromise.join #64598 --- .../workbench/parts/experiments/node/experimentService.ts | 2 +- .../test/electron-browser/experimentService.test.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/vs/workbench/parts/experiments/node/experimentService.ts b/src/vs/workbench/parts/experiments/node/experimentService.ts index f72c1f4757e..addb86c25ae 100644 --- a/src/vs/workbench/parts/experiments/node/experimentService.ts +++ b/src/vs/workbench/parts/experiments/node/experimentService.ts @@ -271,7 +271,7 @@ export class ExperimentService extends Disposable implements IExperimentService }); }); - return TPromise.join(promises).then(() => { + return Promise.all(promises).then(() => { /* __GDPR__ "experiments" : { "experiments" : { "classification": "SystemMetaData", "purpose": "FeatureInsight" } diff --git a/src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts b/src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts index ddf9cceb696..d57a0d2e356 100644 --- a/src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts +++ b/src/vs/workbench/parts/experiments/test/electron-browser/experimentService.test.ts @@ -130,7 +130,7 @@ suite('Experiment Service', () => { tests.push(testObject.getExperimentById('experiment4')); tests.push(testObject.getExperimentById('experiment5')); - return TPromise.join(tests).then(results => { + return Promise.all(tests).then(results => { assert.equal(results[0].id, 'experiment1'); assert.equal(results[0].enabled, false); assert.equal(results[0].state, ExperimentState.NoRun); @@ -554,7 +554,7 @@ suite('Experiment Service', () => { assert.equal(!!result, false); assert.equal(!!storageDataExperiment2, false); }); - return TPromise.join([disabledExperiment, deletedExperiment]).then(() => { + return Promise.all([disabledExperiment, deletedExperiment]).then(() => { assert.equal(storageDataAllExperiments.length, 1); assert.equal(storageDataAllExperiments[0], 'experiment3'); }); @@ -641,7 +641,7 @@ suite('Experiment Service', () => { tests.push(testObject.getExperimentById('experiment3')); tests.push(testObject.getExperimentById('experiment4')); - return TPromise.join(tests).then(results => { + return Promise.all(tests).then(results => { assert.equal(results[0].id, 'experiment1'); assert.equal(results[0].enabled, true); assert.equal(results[0].state, ExperimentState.Run); @@ -728,7 +728,7 @@ suite('Experiment Service', () => { assert.equal(result[0].id, 'prompt-with-no-commands'); assert.equal(result[1].id, 'prompt-with-commands'); }); - return TPromise.join([custom, prompt]); + return Promise.all([custom, prompt]); }); test('experimentsPreviouslyRun includes, excludes check', () => { -- GitLab