test(terminal): assert shell integration wait ordering

Author: koolcandy

src/test/features/terminal/runInTerminal.unit.test.ts

@@ -18,6 +18,10 @@ suite('runInTerminal', () => {
     test('waits for shell integration before executing a command', async () => {
         sinon.stub(shellDetector, 'identifyTerminalShell').returns('fish');
         const waitForShellIntegrationStub = sinon.stub(terminalUtils, 'waitForShellIntegration');
+        let resolveWaitForShellIntegration!: (result: boolean) => void;
+        const waitForShellIntegrationPromise = new Promise<boolean>((resolve) => {
+            resolveWaitForShellIntegration = resolve;
+        });
 
         const execution = {} as TerminalShellExecution;
         const shellIntegration = {
@@ -28,10 +32,7 @@ suite('runInTerminal', () => {
             shellIntegration: undefined,
             sendText: sinon.stub(),
         } as unknown as Terminal;
-        waitForShellIntegrationStub.callsFake(async () => {
-            (terminal as { shellIntegration?: typeof shellIntegration }).shellIntegration = shellIntegration;
-            return true;
-        });
+        waitForShellIntegrationStub.returns(waitForShellIntegrationPromise);
 
         let endListener: ((event: TerminalShellExecutionEndEvent) => void) | undefined;
         sinon.stub(windowApis, 'onDidEndTerminalShellExecution').callsFake((listener) => {
@@ -44,6 +45,13 @@ suite('runInTerminal', () => {
         await new Promise<void>((resolve) => setImmediate(resolve));
 
         sinon.assert.calledOnce(waitForShellIntegrationStub);
+        sinon.assert.notCalled(terminal.sendText as sinon.SinonStub);
+        sinon.assert.notCalled(shellIntegration.executeCommand);
+
+        (terminal as { shellIntegration?: typeof shellIntegration }).shellIntegration = shellIntegration;
+        resolveWaitForShellIntegration(true);
+        await new Promise<void>((resolve) => setImmediate(resolve));
+
         sinon.assert.notCalled(terminal.sendText as sinon.SinonStub);
         sinon.assert.calledOnce(shellIntegration.executeCommand);
         assert.ok(endListener, 'shell execution end listener should be registered');