From d25f6255f67c67a89b10ca593ffdc70d1887ddcb Mon Sep 17 00:00:00 2001 From: rubynguyen1510 Date: Fri, 2 Feb 2024 11:55:53 -0800 Subject: [PATCH 1/4] added data-tag attribute to passageCard --- .../passage/__tests__/passage-card.test.tsx | 11 ++++++++++- src/components/passage/passage-card.tsx | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/components/passage/__tests__/passage-card.test.tsx b/src/components/passage/__tests__/passage-card.test.tsx index 7177ee55b..88d487f07 100644 --- a/src/components/passage/__tests__/passage-card.test.tsx +++ b/src/components/passage/__tests__/passage-card.test.tsx @@ -6,7 +6,7 @@ import {fakePassage} from '../../../test-util'; import {passageIsEmpty} from '../../../util/passage-is-empty'; import {PassageCard, PassageCardProps} from '../passage-card'; -jest.mock('../../tag/tag-stripe'); +jest.mock('../../tag/tag-stripe'); jest.mock('../../../util/passage-is-empty'); describe('', () => { @@ -32,6 +32,15 @@ describe('', () => { ); } + it('should have a data-tag attribute with space-separated tags', () => { + const tags = ['mock-tag-1', 'mock-tag-2']; + const passage = fakePassage({tags}); + renderComponent({passage}); + + const passageElement = screen.getByTestId('passage-card'); + expect(passageElement).toHaveAttribute('data-tag', tags.join(' ')); + }); + it('displays the passage name', () => { const passage = fakePassage(); diff --git a/src/components/passage/passage-card.tsx b/src/components/passage/passage-card.tsx index b2809c15a..de9eeb6e2 100644 --- a/src/components/passage/passage-card.tsx +++ b/src/components/passage/passage-card.tsx @@ -107,7 +107,7 @@ export const PassageCard: React.FC = React.memo(props => { onDrag={onDrag} onStop={onDragStop} > -
+
Date: Mon, 5 Feb 2024 21:10:25 -0800 Subject: [PATCH 2/4] Made revisions based on pull request review comments --- .../passage/__tests__/passage-card.test.tsx | 23 ++++++++++++++----- src/components/passage/passage-card.tsx | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/components/passage/__tests__/passage-card.test.tsx b/src/components/passage/__tests__/passage-card.test.tsx index 88d487f07..cd6c37281 100644 --- a/src/components/passage/__tests__/passage-card.test.tsx +++ b/src/components/passage/__tests__/passage-card.test.tsx @@ -5,8 +5,9 @@ import * as React from 'react'; import {fakePassage} from '../../../test-util'; import {passageIsEmpty} from '../../../util/passage-is-empty'; import {PassageCard, PassageCardProps} from '../passage-card'; +import {lorem} from 'faker'; -jest.mock('../../tag/tag-stripe'); +jest.mock('../../tag/tag-stripe'); jest.mock('../../../util/passage-is-empty'); describe('', () => { @@ -32,13 +33,23 @@ describe('', () => { ); } - it('should have a data-tag attribute with space-separated tags', () => { - const tags = ['mock-tag-1', 'mock-tag-2']; + it('should include data-passage-tag attribute with space-separated tags', () => { + const tags = [lorem.slug(), lorem.slug()]; const passage = fakePassage({tags}); renderComponent({passage}); - - const passageElement = screen.getByTestId('passage-card'); - expect(passageElement).toHaveAttribute('data-tag', tags.join(' ')); + + // eslint-disable-next-line testing-library/no-node-access + const passageElement=document.querySelector('.passage-card') + expect(passageElement).toHaveAttribute('data-passage-tag', tags.join(' ')); + }); + + it('should include data-passage-tag with an empty string when passage has no tags', () => { + const passage = fakePassage({tags:[]}); + renderComponent({passage}); + + // eslint-disable-next-line testing-library/no-node-access + const passageElement=document.querySelector('.passage-card') + expect(passageElement).toHaveAttribute('data-passage-tag', ''); }); it('displays the passage name', () => { diff --git a/src/components/passage/passage-card.tsx b/src/components/passage/passage-card.tsx index de9eeb6e2..bbcdd0f3f 100644 --- a/src/components/passage/passage-card.tsx +++ b/src/components/passage/passage-card.tsx @@ -107,7 +107,7 @@ export const PassageCard: React.FC = React.memo(props => { onDrag={onDrag} onStop={onDragStop} > -
+
Date: Thu, 8 Feb 2024 21:40:33 -0800 Subject: [PATCH 3/4] Update passage-card.tsx --- src/components/passage/passage-card.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/passage/passage-card.tsx b/src/components/passage/passage-card.tsx index bbcdd0f3f..568a1a1cc 100644 --- a/src/components/passage/passage-card.tsx +++ b/src/components/passage/passage-card.tsx @@ -107,7 +107,7 @@ export const PassageCard: React.FC = React.memo(props => { onDrag={onDrag} onStop={onDragStop} > -
+
= React.memo(props => { ); }); -PassageCard.displayName = 'PassageCard'; \ No newline at end of file +PassageCard.displayName = 'PassageCard'; From d290b36d5af681b10736ae7f9d5cdd696b0aa08b Mon Sep 17 00:00:00 2001 From: Ngoc Nguyen <50710444+rubynguyen1510@users.noreply.github.com> Date: Sat, 10 Feb 2024 14:37:52 -0800 Subject: [PATCH 4/4] Update passage-card.test.tsx --- src/components/passage/__tests__/passage-card.test.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/passage/__tests__/passage-card.test.tsx b/src/components/passage/__tests__/passage-card.test.tsx index cd6c37281..1bc532082 100644 --- a/src/components/passage/__tests__/passage-card.test.tsx +++ b/src/components/passage/__tests__/passage-card.test.tsx @@ -40,7 +40,7 @@ describe('', () => { // eslint-disable-next-line testing-library/no-node-access const passageElement=document.querySelector('.passage-card') - expect(passageElement).toHaveAttribute('data-passage-tag', tags.join(' ')); + expect(passageElement).toHaveAttribute('data-passage-tags', tags.join(' ')); }); it('should include data-passage-tag with an empty string when passage has no tags', () => { @@ -49,7 +49,7 @@ describe('', () => { // eslint-disable-next-line testing-library/no-node-access const passageElement=document.querySelector('.passage-card') - expect(passageElement).toHaveAttribute('data-passage-tag', ''); + expect(passageElement).toHaveAttribute('data-passage-tags', ''); }); it('displays the passage name', () => {