diff --git a/backend/tests/Feature/ElementsEndpointTest.php b/backend/tests/Feature/ElementsEndpointTest.php index 32b9f21..33725c8 100644 --- a/backend/tests/Feature/ElementsEndpointTest.php +++ b/backend/tests/Feature/ElementsEndpointTest.php @@ -28,6 +28,7 @@ class ElementsEndpointTest extends TestCase set: $set, title: 'Baderech HaAvodah', description: 'A structured path for growth', + iconImageUrl: '/assets/baderech-haavodah-icon.png', richText: '

A structured path for growth

', pdfPath: '/assets/pdfs/baderech.pdf', youtubeUrl: $sampleYoutubeUrl, @@ -37,6 +38,7 @@ class ElementsEndpointTest extends TestCase set: $set, title: 'Avodah Foundations', description: 'Foundations for steady avodah', + iconImageUrl: null, richText: '

Foundations rich text

', pdfPath: '/assets/pdfs/foundations.pdf', youtubeUrl: null, @@ -46,6 +48,7 @@ class ElementsEndpointTest extends TestCase set: $set, title: 'Daily Practice', description: 'Daily practices for growth', + iconImageUrl: null, richText: '

Daily practice rich text

', pdfPath: null, youtubeUrl: null, @@ -72,6 +75,7 @@ class ElementsEndpointTest extends TestCase 'id' => $element->getId(), 'title' => 'Baderech HaAvodah', 'description' => 'A structured path for growth', + 'iconImageUrl' => '/assets/baderech-haavodah-icon.png', 'richText' => '

A structured path for growth

', 'pdfPath' => '/assets/pdfs/baderech.pdf', 'youtubeUrl' => $sampleYoutubeUrl, diff --git a/backend/tests/Feature/SetsEndpointTest.php b/backend/tests/Feature/SetsEndpointTest.php index e5cfdad..c7c67c4 100644 --- a/backend/tests/Feature/SetsEndpointTest.php +++ b/backend/tests/Feature/SetsEndpointTest.php @@ -32,6 +32,7 @@ class SetsEndpointTest extends TestCase set: $baderechSet, title: $baderechSet->getName(), description: $baderechSet->getDescription(), + iconImageUrl: null, richText: '', pdfPath: null, youtubeUrl: null, diff --git a/backend/tests/Unit/Controllers/ElementControllerTest.php b/backend/tests/Unit/Controllers/ElementControllerTest.php index 95ba6f5..d06c0f7 100644 --- a/backend/tests/Unit/Controllers/ElementControllerTest.php +++ b/backend/tests/Unit/Controllers/ElementControllerTest.php @@ -30,6 +30,7 @@ class ElementControllerTest extends TestCase $set, 'Baderech HaAvodah', 'A structured path for growth', + '/assets/baderech-icon.png', '

A structured path for growth

', '/assets/pdfs/baderech.pdf', 'https://www.youtube.com/watch?v=yHx-r4p6hHU&t=1s', @@ -39,6 +40,7 @@ class ElementControllerTest extends TestCase $set, 'Avodah Foundations', 'Foundations for steady avodah', + null, '

Foundations rich text

', '/assets/pdfs/foundations.pdf', null, @@ -48,6 +50,7 @@ class ElementControllerTest extends TestCase $set, 'Daily Practice', 'Daily practices for growth', + null, '

Daily practice rich text

', null, null, @@ -68,6 +71,10 @@ class ElementControllerTest extends TestCase '

A structured path for growth

', $body['element']['richText'], ); + $this->assertSame( + '/assets/baderech-icon.png', + $body['element']['iconImageUrl'], + ); $this->assertSame( '/assets/pdfs/baderech.pdf', $body['element']['pdfPath'], @@ -126,6 +133,7 @@ class ElementControllerTest extends TestCase DomainSet $set, string $title, string $description, + ?string $iconImageUrl, string $richText, ?string $pdfPath, ?string $youtubeUrl, @@ -135,6 +143,7 @@ class ElementControllerTest extends TestCase set: $set, title: $title, description: $description, + iconImageUrl: $iconImageUrl, richText: $richText, pdfPath: $pdfPath, youtubeUrl: $youtubeUrl, diff --git a/backend/tests/Unit/Element/ElementTest.php b/backend/tests/Unit/Element/ElementTest.php index 7d0bcf2..16c08a7 100644 --- a/backend/tests/Unit/Element/ElementTest.php +++ b/backend/tests/Unit/Element/ElementTest.php @@ -20,6 +20,7 @@ class ElementTest extends TestCase id: 1, title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: null, @@ -30,6 +31,7 @@ class ElementTest extends TestCase id: 2, title: 'Child', description: 'Child description', + iconImageUrl: '/assets/child-icon.svg', richText: '

Child rich text

', pdfPath: '/assets/pdfs/child.pdf', youtubeUrl: 'https://www.youtube.com/watch?v=yHx-r4p6hHU&t=1s', @@ -43,6 +45,10 @@ class ElementTest extends TestCase 'Child description', $childElement->getDescription(), ); + $this->assertSame( + '/assets/child-icon.svg', + $childElement->getIconImageUrl(), + ); $this->assertSame( '

Child rich text

', $childElement->getRichText(), @@ -57,6 +63,7 @@ class ElementTest extends TestCase ); $this->assertSame($set, $childElement->getSet()); $this->assertSame($rootElement, $childElement->getParentElement()); + $this->assertNull($rootElement->getIconImageUrl()); $this->assertNull($rootElement->getPdfPath()); $this->assertNull($rootElement->getYoutubeUrl()); $this->assertNull($rootElement->getParentElement()); diff --git a/backend/tests/Unit/Element/UseCases/CreateElementTest.php b/backend/tests/Unit/Element/UseCases/CreateElementTest.php index 05e7d66..09ad0d8 100644 --- a/backend/tests/Unit/Element/UseCases/CreateElementTest.php +++ b/backend/tests/Unit/Element/UseCases/CreateElementTest.php @@ -48,6 +48,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Root', description: 'Root description', + iconImageUrl: '/assets/root-icon.svg', richText: '

Root rich text

', pdfPath: '/assets/pdfs/root.pdf', youtubeUrl: 'https://www.youtube.com/watch?v=yHx-r4p6hHU&t=1s', @@ -57,6 +58,10 @@ class CreateElementTest extends TestCase $this->assertInstanceOf(Element::class, $element); $this->assertSame('Root', $element->getTitle()); $this->assertSame('Root description', $element->getDescription()); + $this->assertSame( + '/assets/root-icon.svg', + $element->getIconImageUrl(), + ); $this->assertSame('

Root rich text

', $element->getRichText()); $this->assertSame('/assets/pdfs/root.pdf', $element->getPdfPath()); $this->assertSame( @@ -75,6 +80,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: null, @@ -87,6 +93,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Child', description: 'Child description', + iconImageUrl: '/assets/child-icon.svg', richText: '

Child rich text

', pdfPath: '/assets/pdfs/child.pdf', youtubeUrl: 'https://youtu.be/yHx-r4p6hHU', @@ -99,6 +106,10 @@ class CreateElementTest extends TestCase 'Child description', $childElement->getDescription(), ); + $this->assertSame( + '/assets/child-icon.svg', + $childElement->getIconImageUrl(), + ); $this->assertSame( '

Child rich text

', $childElement->getRichText(), @@ -125,6 +136,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Root', description: null, + iconImageUrl: null, richText: null, pdfPath: null, youtubeUrl: null, @@ -132,11 +144,30 @@ class CreateElementTest extends TestCase )); $this->assertSame('', $element->getDescription()); + $this->assertNull($element->getIconImageUrl()); $this->assertSame('', $element->getRichText()); $this->assertNull($element->getPdfPath()); $this->assertNull($element->getYoutubeUrl()); } + public function testCreatesElementWithNullIconImageUrlWhenBlank(): void + { + $set = $this->createSet('Daily learning'); + + $element = $this->createElement->execute(new CreateElementRequest( + setId: $set->getId(), + title: 'Root', + description: 'Root description', + iconImageUrl: '', + richText: '

Root rich text

', + pdfPath: null, + youtubeUrl: null, + parentElementId: null, + )); + + $this->assertNull($element->getIconImageUrl()); + } + public function testCreatesElementWithNullPdfPathWhenBlank(): void { $set = $this->createSet('Daily learning'); @@ -145,6 +176,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: '', youtubeUrl: null, @@ -162,6 +194,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: '', @@ -180,6 +213,7 @@ class CreateElementTest extends TestCase setId: null, title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: null, @@ -196,6 +230,7 @@ class CreateElementTest extends TestCase setId: 1, title: null, description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: null, @@ -212,6 +247,7 @@ class CreateElementTest extends TestCase setId: 99, title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: null, @@ -232,6 +268,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Child', description: 'Child description', + iconImageUrl: null, richText: '

Child rich text

', pdfPath: null, youtubeUrl: null, @@ -246,6 +283,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Root', description: 'Root description', + iconImageUrl: null, richText: '

Root rich text

', pdfPath: null, youtubeUrl: null, @@ -261,6 +299,7 @@ class CreateElementTest extends TestCase setId: $set->getId(), title: 'Another root', description: 'Another root description', + iconImageUrl: null, richText: '

Another root rich text

', pdfPath: null, youtubeUrl: null, @@ -277,6 +316,7 @@ class CreateElementTest extends TestCase setId: $parentSet->getId(), title: 'Parent root', description: 'Parent root description', + iconImageUrl: null, richText: '

Parent root rich text

', pdfPath: null, youtubeUrl: null, @@ -293,6 +333,7 @@ class CreateElementTest extends TestCase setId: $childSet->getId(), title: 'Invalid child', description: 'Invalid child description', + iconImageUrl: null, richText: '

Invalid child rich text

', pdfPath: null, youtubeUrl: null, diff --git a/backend/tests/Unit/Element/UseCases/GetElementTest.php b/backend/tests/Unit/Element/UseCases/GetElementTest.php index f175b62..ff066de 100644 --- a/backend/tests/Unit/Element/UseCases/GetElementTest.php +++ b/backend/tests/Unit/Element/UseCases/GetElementTest.php @@ -31,6 +31,7 @@ class GetElementTest extends TestCase $set, 'Baderech HaAvodah', 'A structured path for growth', + '/assets/baderech-icon.png', '

A structured path for growth

', '/assets/pdfs/baderech.pdf', 'https://www.youtube.com/watch?v=yHx-r4p6hHU&t=1s', @@ -49,6 +50,10 @@ class GetElementTest extends TestCase 'A structured path for growth', $foundElement->getDescription(), ); + $this->assertSame( + '/assets/baderech-icon.png', + $foundElement->getIconImageUrl(), + ); $this->assertSame( '

A structured path for growth

', $foundElement->getRichText(), @@ -70,6 +75,7 @@ class GetElementTest extends TestCase $set, 'Baderech HaAvodah', 'A structured path for growth', + null, '

A structured path for growth

', '/assets/pdfs/baderech.pdf', null, @@ -79,6 +85,7 @@ class GetElementTest extends TestCase $set, 'Avodah Foundations', 'Foundations for steady avodah', + null, '

Foundations rich text

', '/assets/pdfs/foundations.pdf', null, @@ -88,6 +95,7 @@ class GetElementTest extends TestCase $set, 'Daily Practice', 'Daily practices for growth', + null, '

Daily practice rich text

', null, null, @@ -97,6 +105,7 @@ class GetElementTest extends TestCase $set, 'Nested Practice', 'Nested description', + null, '

Nested rich text

', null, null, @@ -107,6 +116,7 @@ class GetElementTest extends TestCase $otherSet, 'Other Parent', 'Other parent description', + null, '

Other parent rich text

', null, null, @@ -116,6 +126,7 @@ class GetElementTest extends TestCase $otherSet, 'Other Child', 'Other child description', + null, '

Other child rich text

', null, null, @@ -178,6 +189,7 @@ class GetElementTest extends TestCase DomainSet $set, string $title, string $description, + ?string $iconImageUrl, string $richText, ?string $pdfPath, ?string $youtubeUrl, @@ -187,6 +199,7 @@ class GetElementTest extends TestCase set: $set, title: $title, description: $description, + iconImageUrl: $iconImageUrl, richText: $richText, pdfPath: $pdfPath, youtubeUrl: $youtubeUrl, diff --git a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts index daa0532..c2894a4 100644 --- a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts +++ b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts @@ -41,6 +41,10 @@ describe('media page sets', () => { cy.location('pathname').should('eq', '/element/1') cy.get('[data-cy="element-page"]').should('be.visible') cy.contains('h1', 'Baderech HaAvodah').should('be.visible') + cy.get('[data-cy="element-icon"]') + .should('be.visible') + .and('have.attr', 'src') + .and('include', '/assets/baderech-haavodah-icon.png') cy.get('[data-cy="element-rich-text"]').within(() => { cy.contains('Begin with a clear map for avodah growth.') .should('be.visible') @@ -82,6 +86,7 @@ describe('media page sets', () => { .click() cy.location('pathname').should('eq', '/element/2') cy.contains('h1', 'Avodah Foundations').should('be.visible') + cy.get('[data-cy="element-icon"]').should('not.exist') cy.get('[data-cy="element-rich-text"]') .should( 'contain.text',