From 0e1f8b11ed62eaf0fe5a6348a458b8eddb85e691 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 20 Jul 2023 13:03:22 +0200 Subject: [PATCH] fix tests, `waitFor` needs to be called before entering `run` because that now pushes/enters a state sync --- .../test/browser/inlineChatController.test.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts index f4ba0f5b182..d491c195234 100644 --- a/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts +++ b/src/vs/workbench/contrib/inlineChat/test/browser/inlineChatController.test.ts @@ -148,9 +148,9 @@ suite('InteractiveChatController', function () { test('run (show/hide)', async function () { ctrl = instaService.createInstance(TestController, editor); + const p = ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND); const run = ctrl.run({ message: 'Hello', autoSend: true }); - - await ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND); + await p; assert.ok(ctrl.getWidgetPosition() !== undefined); ctrl.cancelSession(); @@ -218,9 +218,10 @@ suite('InteractiveChatController', function () { test('typing outside of wholeRange finishes session', async function () { ctrl = instaService.createInstance(TestController, editor); + const p = ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND); ctrl.run({ message: 'Hello', autoSend: true }); - await ctrl.waitFor(TestController.INIT_SEQUENCE_AUTO_SEND); + await p; const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri); assert.ok(session); @@ -257,9 +258,10 @@ suite('InteractiveChatController', function () { }); store.add(d); ctrl = instaService.createInstance(TestController, editor); + const p = ctrl.waitFor(TestController.INIT_SEQUENCE); ctrl.run({ message: 'Hello', autoSend: false }); - await ctrl.waitFor(TestController.INIT_SEQUENCE); + await p; const session = inlineChatSessionService.getSession(editor, editor.getModel()!.uri); assert.ok(session); @@ -298,12 +300,13 @@ suite('InteractiveChatController', function () { }); store.add(d); ctrl = instaService.createInstance(TestController, editor); - const p = ctrl.run({ message: 'Hello', autoSend: true }); - - await ctrl.waitFor([...TestController.INIT_SEQUENCE, State.MAKE_REQUEST]); - ctrl.acceptSession(); + const p = ctrl.waitFor([...TestController.INIT_SEQUENCE, State.MAKE_REQUEST]); + const r = ctrl.run({ message: 'Hello', autoSend: true }); await p; + ctrl.acceptSession(); + + await r; assert.strictEqual(ctrl.getWidgetPosition(), undefined); }); });