Skip to content

Commit 944edf1

Browse files
backspacebackspace
committed
Update selector name for clarity
1 parent fca3531 commit 944edf1

File tree

4 files changed

+40
-38
lines changed

4 files changed

+40
-38
lines changed

‎packages/base/room.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ class EmbeddedMessageField extends Component<typeof MessageField> {
187187
</div>
188188
{{else if cardResource.card}}
189189
{{#let (getCardComponent cardResource.card) as |CardComponent|}}
190-
<div data-test-selected-card={{cardResource.card.id}}>
190+
<div data-test-attached-card={{cardResource.card.id}}>
191191
<CardComponent />
192192
</div>
193193
{{/let}}

‎packages/host/app/components/card-pill.gts

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export default class CardPill extends Component<CardPillSignature> {
3030
<Pill
3131
@inert={{true}}
3232
class={{cn 'card-pill' is-autoattached=@isAutoAttachedCard}}
33-
data-test-selected-card={{@card.id}}
33+
data-test-attached-card={{@card.id}}
3434
data-test-autoattached-card={{@isAutoAttachedCard}}
3535
>
3636
<:icon>

‎packages/matrix/helpers/index.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ export async function assertMessages(
390390
).toHaveCount(1);
391391
await expect(
392392
page.locator(
393-
`[data-test-message-idx="${index}"] [data-test-selected-card]`,
393+
`[data-test-message-idx="${index}"] [data-test-attached-card]`,
394394
),
395395
).toHaveCount(cards.length);
396396
cards.map(async (card) => {
@@ -403,15 +403,15 @@ export async function assertMessages(
403403
// note: attached cards are in atom format (which display the title by default)
404404
await expect(
405405
page.locator(
406-
`[data-test-message-idx="${index}"] [data-test-selected-card="${card.id}"]`,
406+
`[data-test-message-idx="${index}"] [data-test-attached-card="${card.id}"]`,
407407
),
408408
).toContainText(card.title);
409409
}
410410

411411
if (card.realmIconUrl) {
412412
await expect(
413413
page.locator(
414-
`[data-test-message-idx="${index}"] [data-test-selected-card="${card.id}"] [data-test-realm-icon-url="${card.realmIconUrl}"]`,
414+
`[data-test-message-idx="${index}"] [data-test-attached-card="${card.id}"] [data-test-realm-icon-url="${card.realmIconUrl}"]`,
415415
),
416416
).toHaveCount(1);
417417
}

‎packages/matrix/tests/messages.spec.ts

+35-33
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ test.describe('Room messages', () => {
150150
await page.locator(`[data-test-select="${testCard}"]`).click();
151151
await page.locator('[data-test-card-catalog-go-button]').click();
152152
await expect(
153-
page.locator(`[data-test-selected-card="${testCard}"]`),
153+
page.locator(`[data-test-attached-card="${testCard}"]`),
154154
).toContainText('Hassan');
155155

156156
await page.locator('[data-test-message-field]').fill('This is _my_ card');
@@ -184,7 +184,7 @@ test.describe('Room messages', () => {
184184
await page.locator(`[data-test-select="${testCard}"]`).click();
185185
await page.locator('[data-test-card-catalog-go-button]').click();
186186
await expect(
187-
page.locator(`[data-test-selected-card="${testCard}"]`),
187+
page.locator(`[data-test-attached-card="${testCard}"]`),
188188
).toContainText('Big Card');
189189

190190
await page.locator('[data-test-message-field]').fill('This is a big card');
@@ -227,7 +227,7 @@ test.describe('Room messages', () => {
227227
await page.locator(`[data-test-select="${testCard}"]`).click();
228228
await page.locator('[data-test-card-catalog-go-button]').click();
229229
await expect(
230-
page.locator(`[data-test-selected-card="${testCard}"]`),
230+
page.locator(`[data-test-attached-card="${testCard}"]`),
231231
).toContainText('Mango the Puppy');
232232

233233
await page
@@ -325,7 +325,7 @@ test.describe('Room messages', () => {
325325
).toHaveCount(1);
326326
await page
327327
.locator(
328-
`[data-test-selected-card="${testHost}/mango"] [data-test-remove-card-btn]`,
328+
`[data-test-attached-card="${testHost}/mango"] [data-test-remove-card-btn]`,
329329
)
330330
.click();
331331
await sendMessage(page, room1, 'please change this card');
@@ -386,7 +386,7 @@ test.describe('Room messages', () => {
386386
]);
387387
});
388388

389-
test('can remove a card from a pending message', async ({ page }) => {
389+
test.only('can remove a card from a pending message', async ({ page }) => {
390390
const testCard = `${testHost}/hassan`;
391391
const testCard2 = `${testHost}/mango`;
392392
await login(page, 'user1', 'pass');
@@ -395,38 +395,40 @@ test.describe('Room messages', () => {
395395
await selectCardFromCatalog(page, testCard);
396396
await selectCardFromCatalog(page, testCard2);
397397
await expect(
398-
page.locator(`[data-test-selected-card="${testCard}"]`),
398+
page.locator(`[data-test-attached-card="${testCard}"]`),
399399
).toContainText('Hassan');
400400
await expect(
401-
page.locator(`[data-test-selected-card="${testCard2}"]`),
401+
page.locator(`[data-test-attached-card="${testCard2}"]`),
402402
).toContainText('Mango');
403403

404404
await page
405405
.locator(
406-
`[data-test-selected-card="${testCard}"] [data-test-remove-card-btn]`,
406+
`[data-test-attached-card="${testCard}"] [data-test-remove-card-btn]`,
407407
)
408408
.click();
409-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
409+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
410410

411411
await page.locator('[data-test-message-field]').fill('1 card');
412412
await page.locator('[data-test-send-message-btn]').click();
413413

414414
await selectCardFromCatalog(page, testCard);
415415
await expect(
416-
page.locator(`[data-test-selected-card="${testCard}"]`),
416+
page.locator(`[data-test-attached-card="${testCard}"]`),
417417
).toContainText('Hassan');
418418
await page
419419
.locator(
420-
`[data-test-selected-card="${testCard}"] [data-test-remove-card-btn]`,
420+
`[data-test-attached-card="${testCard}"] [data-test-remove-card-btn]`,
421421
)
422422
.click();
423423
await expect(
424-
page.locator(`[data-test-chat-input-area] [data-test-selected-card]`),
424+
page.locator(`[data-test-chat-input-area] [data-test-attached-card]`),
425425
).toHaveCount(0);
426426

427427
await page.locator('[data-test-message-field]').fill('no card');
428428
await page.locator('[data-test-send-message-btn]').click();
429429

430+
await page.pause();
431+
430432
await assertMessages(page, [
431433
{
432434
from: 'user1',
@@ -517,7 +519,7 @@ test.describe('Room messages', () => {
517519
await selectCardFromCatalog(page, testCard1);
518520
await selectCardFromCatalog(page, testCard2);
519521
await selectCardFromCatalog(page, testCard3);
520-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(3);
522+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(3);
521523

522524
await page.locator('[data-test-send-message-btn]').click();
523525
await assertMessages(page, [
@@ -547,19 +549,19 @@ test.describe('Room messages', () => {
547549
await selectCardFromCatalog(page, testCard1);
548550
await selectCardFromCatalog(page, testCard2);
549551
await selectCardFromCatalog(page, testCard3);
550-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(3);
552+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(3);
551553

552554
await selectCardFromCatalog(page, testCard4);
553-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(4);
555+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(4);
554556
await expect(page.locator(`[data-test-view-all]`)).toHaveCount(0);
555557

556558
await selectCardFromCatalog(page, testCard5);
557-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(3);
559+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(3);
558560
await expect(page.locator(`[data-test-view-all]`)).toHaveCount(1);
559561

560562
await page.locator('[data-test-view-all]').click();
561563
await expect(page.locator(`[data-test-view-all]`)).toHaveCount(0);
562-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(5);
564+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(5);
563565
});
564566

565567
test('displays auto-attached card', async ({ page }) => {
@@ -576,14 +578,14 @@ test.describe('Room messages', () => {
576578
// Make sure we've got an open room
577579
await getRoomName(page);
578580

579-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
580-
await page.locator(`[data-test-selected-card]`).hover();
581+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
582+
await page.locator(`[data-test-attached-card]`).hover();
581583
await expect(page.locator(`[data-test-tooltip-content]`)).toHaveText(
582584
'Topmost card is shared automatically',
583585
);
584586

585587
await selectCardFromCatalog(page, testCard2);
586-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(2);
588+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(2);
587589

588590
// Do not auto-attach a card if it has been selected
589591
await page
@@ -594,7 +596,7 @@ test.describe('Room messages', () => {
594596
`[data-test-stack-item-content] [data-test-cards-grid-item='${testCard2}']`,
595597
)
596598
.click();
597-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
599+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
598600

599601
await page
600602
.locator(`[data-test-stack-card='${testCard2}'] [data-test-close-button]`)
@@ -604,7 +606,7 @@ test.describe('Room messages', () => {
604606
`[data-test-stack-item-content] [data-test-cards-grid-item='${testCard1}']`,
605607
)
606608
.click();
607-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(2);
609+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(2);
608610

609611
await page.locator('[data-test-send-message-btn]').click();
610612
await assertMessages(page, [
@@ -627,7 +629,7 @@ test.describe('Room messages', () => {
627629

628630
// assert nothing attached
629631

630-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(0);
632+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(0);
631633

632634
// Opening a card should result in it being auto-attached
633635
await page
@@ -636,8 +638,8 @@ test.describe('Room messages', () => {
636638
)
637639
.click();
638640

639-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
640-
await page.locator(`[data-test-selected-card]`).hover();
641+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
642+
await page.locator(`[data-test-attached-card]`).hover();
641643
await expect(page.locator(`[data-test-tooltip-content]`)).toHaveText(
642644
'Topmost card is shared automatically',
643645
);
@@ -648,7 +650,7 @@ test.describe('Room messages', () => {
648650
.click();
649651

650652
// Should have no cards attached again
651-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(0);
653+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(0);
652654

653655
// Fill in a message
654656

@@ -681,13 +683,13 @@ test.describe('Room messages', () => {
681683
// If user removes the auto-attached card,
682684
// and then opens another card in the stack,
683685
// the card will be attached automatically.
684-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
686+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
685687
await page
686688
.locator(
687-
`[data-test-selected-card='${testCard1}'] [data-test-remove-card-btn]`,
689+
`[data-test-attached-card='${testCard1}'] [data-test-remove-card-btn]`,
688690
)
689691
.click();
690-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(0);
692+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(0);
691693
await page
692694
.locator(`[data-test-stack-card='${testCard1}'] [data-test-close-button]`)
693695
.click();
@@ -696,15 +698,15 @@ test.describe('Room messages', () => {
696698
`[data-test-stack-item-content] [data-test-cards-grid-item='${testCard2}']`,
697699
)
698700
.click();
699-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
701+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
700702
await page
701703
.locator(
702-
`[data-test-selected-card='${testCard2}'] [data-test-remove-card-btn]`,
704+
`[data-test-attached-card='${testCard2}'] [data-test-remove-card-btn]`,
703705
)
704706
.click();
705-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(0);
707+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(0);
706708
await selectCardFromCatalog(page, testCard3);
707-
await expect(page.locator(`[data-test-selected-card]`)).toHaveCount(1);
709+
await expect(page.locator(`[data-test-attached-card]`)).toHaveCount(1);
708710
await page.locator('[data-test-send-message-btn]').click();
709711
await assertMessages(page, [
710712
{

0 commit comments

Comments
 (0)