Skip to content

Commit 1576b13

Browse files
committed
Fix host tests
1 parent 52ce61f commit 1576b13

File tree

4 files changed

+47
-16
lines changed

4 files changed

+47
-16
lines changed

packages/host/app/services/matrix-service.ts

+19
Original file line numberDiff line numberDiff line change
@@ -1234,15 +1234,34 @@ export default class MatrixService extends Service {
12341234
}
12351235
}
12361236

1237+
let startTime = Date.now();
1238+
let checkCount = 0;
1239+
12371240
let timeline = room.getLiveTimeline();
12381241
let events = timeline.getEvents();
12391242
await new Promise<void>((resolve) => {
12401243
let checkEvents = () => {
1244+
checkCount++;
1245+
let elapsedTime = Date.now() - startTime;
12411246
let allEventsConsumed = events.every((event) =>
12421247
roomData.events.some((e) => e.event_id === event.getId()),
12431248
);
12441249

1250+
console.log(
1251+
`[Matrix Service] Waiting for events... (${elapsedTime}ms, attempt ${checkCount})`,
1252+
`\n - Events to consume: ${events.length}`,
1253+
`\n - Events consumed: ${
1254+
events.filter((event) =>
1255+
roomData.events.some((e) => e.event_id === event.getId()),
1256+
).length
1257+
}`,
1258+
`\n - All consumed: ${allEventsConsumed}`,
1259+
);
1260+
12451261
if (allEventsConsumed) {
1262+
console.log(
1263+
`[Matrix Service] All events consumed after ${elapsedTime}ms and ${checkCount} checks`,
1264+
);
12461265
resolve();
12471266
} else {
12481267
setTimeout(checkEvents, 100);

packages/host/tests/acceptance/ai-assistant-test.gts

+4-4
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ module('Acceptance | AI Assistant tests', function (hooks) {
275275
await click('[data-test-llm-select-item="google/gemini-pro-1.5"]');
276276
assert.dom('[data-test-llm-select-selected]').hasText('gemini-pro-1.5');
277277

278-
let roomState = getRoomState('mock_room_1', APP_BOXEL_ACTIVE_LLM, '');
278+
let roomState = getRoomState(matrixRoomId, APP_BOXEL_ACTIVE_LLM, '');
279279
assert.strictEqual(roomState.model, 'google/gemini-pro-1.5');
280280
});
281281

@@ -291,9 +291,9 @@ module('Acceptance | AI Assistant tests', function (hooks) {
291291
],
292292
});
293293

294+
await click('[data-test-open-ai-assistant]');
294295
await click('[data-test-submode-switcher] button');
295296
await click('[data-test-boxel-menu-item-text="Code"]');
296-
await click('[data-test-open-ai-assistant]');
297297
assert.dom('[data-test-llm-select-selected]').hasText('claude-3.5-sonnet');
298298

299299
createAndJoinRoom({
@@ -302,8 +302,8 @@ module('Acceptance | AI Assistant tests', function (hooks) {
302302
});
303303

304304
await click('[data-test-past-sessions-button]');
305-
await waitFor("[data-test-enter-room='mock_room_2']");
306-
await click('[data-test-enter-room="mock_room_2"]');
305+
await waitFor("[data-test-enter-room='mock_room_1']");
306+
await click('[data-test-enter-room="mock_room_1"]');
307307
assert.dom('[data-test-llm-select-selected]').hasText('claude-3.5-sonnet');
308308
});
309309

packages/host/tests/acceptance/commands-test.gts

+16-5
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ import {
1010
settled,
1111
} from '@ember/test-helpers';
1212

13+
import { fillIn } from '@ember/test-helpers';
14+
1315
import { module, test } from 'qunit';
1416

1517
import { GridContainer } from '@cardstack/boxel-ui/components';
@@ -317,7 +319,7 @@ module('Acceptance | Commands tests', function (hooks) {
317319
);
318320
await sendAiAssistantMessageCommand.execute({
319321
prompt: 'Please delay',
320-
roomId: 'mock_room_1',
322+
roomId: getRoomIds().pop()!,
321323
commands: [{ command: sleepCommand, autoExecute: true }],
322324
});
323325
await sleepCommand.execute(new ScheduleMeetingInput());
@@ -359,7 +361,7 @@ module('Acceptance | Commands tests', function (hooks) {
359361
commandContext,
360362
);
361363
await openAiAssistantRoomCommand.execute({
362-
roomId: 'mock_room_1',
364+
roomId: getRoomIds().pop()!,
363365
});
364366
};
365367

@@ -681,8 +683,8 @@ module('Acceptance | Commands tests', function (hooks) {
681683
`[data-test-stack-card="${testRealmURL}index"] [data-test-cards-grid-item="${testCard}"]`,
682684
);
683685
await click('[data-test-delay-button]');
684-
await waitUntil(() => getRoomIds().includes('mock_room_1'));
685-
let roomId = 'mock_room_1';
686+
await waitUntil(() => getRoomIds().length > 0);
687+
let roomId = getRoomIds().pop()!;
686688
let message = getRoomEvents(roomId).pop()!;
687689
let boxelMessageData = JSON.parse(message.content.data);
688690
let toolName = boxelMessageData.context.tools[0].function.name;
@@ -1105,11 +1107,20 @@ module('Acceptance | Commands tests', function (hooks) {
11051107
],
11061108
],
11071109
});
1110+
let roomId = getRoomIds().pop()!;
11081111
// open assistant, ShowCard command is part of default CardEditing skill
11091112
await click('[data-test-open-ai-assistant]');
11101113

1114+
// Need to create a new room so this new room will include skills card
1115+
await fillIn(
1116+
'[data-test-message-field]',
1117+
'Test message to enable new session button',
1118+
);
1119+
await click('[data-test-send-message-btn]');
1120+
await click('[data-test-create-room-btn]');
1121+
11111122
// simulate message
1112-
let roomId = getRoomIds().pop()!;
1123+
roomId = getRoomIds().pop()!;
11131124
simulateRemoteMessage(roomId, '@aibot:localhost', {
11141125
body: 'Show the card',
11151126
msgtype: APP_BOXEL_MESSAGE_MSGTYPE,

pnpm-lock.yaml

+8-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)