diff --git a/backend/tests/Feature/DemoSeedDataTest.php b/backend/tests/Feature/DemoSeedDataTest.php index fcc4fe7..d948cae 100644 --- a/backend/tests/Feature/DemoSeedDataTest.php +++ b/backend/tests/Feature/DemoSeedDataTest.php @@ -6,6 +6,7 @@ use App\Element\ElementRepository; use App\Set\SetRepository; use Database\Seeders\DatabaseSeeder; use Illuminate\Foundation\Testing\RefreshDatabase; +use Illuminate\Support\Facades\Storage; use Tests\TestCase; class DemoSeedDataTest extends TestCase @@ -14,6 +15,8 @@ class DemoSeedDataTest extends TestCase public function testBaderechRootElementHasDemoChildren(): void { + Storage::fake('public'); + $this->seed(DatabaseSeeder::class); $setRepository = app(SetRepository::class); @@ -23,6 +26,13 @@ class DemoSeedDataTest extends TestCase $childElements = $elementRepository->findByParentElement($rootElement); $this->assertSame('', $rootElement->getRichText()); + $this->assertSame( + 'element-icons/baderech-haavodah-icon.png', + $rootElement->getIconImageUrl(), + ); + Storage::disk('public')->assertExists( + 'element-icons/baderech-haavodah-icon.png', + ); $this->assertNull($rootElement->getPdfPath()); $this->assertNull($rootElement->getYoutubeUrl()); $this->assertCount(6, $childElements); @@ -76,9 +86,10 @@ class DemoSeedDataTest extends TestCase $childElements[0]->getRichText(), ); $this->assertSame( - '/assets/pdfs/baderech.pdf', + 'element-pdfs/baderech.pdf', $childElements[0]->getPdfPath(), ); + Storage::disk('public')->assertExists('element-pdfs/baderech.pdf'); $introductionChildElements = $elementRepository->findByParentElement( $childElements[0], diff --git a/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php b/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php index 14f8a34..ca39700 100644 --- a/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php +++ b/backend/tests/Unit/Element/UseCases/UpdateElementFieldsTest.php @@ -106,30 +106,8 @@ class UpdateElementFieldsTest extends TestCase $this->assertNull($updatedElement->getIconImageUrl()); $this->assertSame($element->getTitle(), $updatedElement->getTitle()); - $this->assertSame([], $this->fileUploader->deletedPaths); - } - - public function testUpdateIconImageUrlDeletesManagedFileWhenCleared(): void - { - $element = $this->createElementWithMedia( - 'element-icons/original-icon.png', - '/assets/pdfs/original.pdf', - ); - $updateIconImageUrl = new UpdateIconImageUrl( - $this->elementRepo, - $this->fileUploader, - ); - - $updatedElement = $updateIconImageUrl->execute( - new UpdateIconImageUrlRequest( - id: $element->getId(), - iconImageUrl: '', - ) - ); - - $this->assertNull($updatedElement->getIconImageUrl()); $this->assertSame( - ['element-icons/original-icon.png'], + ['/assets/original-icon.png'], $this->fileUploader->deletedPaths, ); } @@ -170,27 +148,8 @@ class UpdateElementFieldsTest extends TestCase $this->assertNull($updatedElement->getPdfPath()); $this->assertSame($element->getTitle(), $updatedElement->getTitle()); - $this->assertSame([], $this->fileUploader->deletedPaths); - } - - public function testUpdatePdfPathDeletesManagedFileWhenCleared(): void - { - $element = $this->createElementWithMedia( - '/assets/original-icon.png', - 'element-pdfs/original.pdf', - ); - $updatePdfPath = new UpdatePdfPath( - $this->elementRepo, - $this->fileUploader, - ); - - $updatedElement = $updatePdfPath->execute( - new UpdatePdfPathRequest(id: $element->getId(), pdfPath: '') - ); - - $this->assertNull($updatedElement->getPdfPath()); $this->assertSame( - ['element-pdfs/original.pdf'], + ['/assets/pdfs/original.pdf'], $this->fileUploader->deletedPaths, ); } diff --git a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts index b3e1424..ade88e7 100644 --- a/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts +++ b/frontend/rabbi_gerzi/cypress/e2e/media.cy.ts @@ -47,7 +47,7 @@ describe('media page sets', () => { cy.get('[data-cy="element-icon"]') .should('be.visible') .and('have.attr', 'src') - .and('include', '/assets/baderech-haavodah-icon.png') + .and('include', '/storage/element-icons/baderech-haavodah-icon.png') cy.get('[data-cy="element-rich-text"]').should('not.exist') cy.get('[data-cy="element-youtube-embed"]') .should('not.exist') @@ -118,7 +118,8 @@ describe('media page sets', () => { cy.get('[data-cy="element-youtube-embed"]').should('not.exist') cy.contains('[data-cy="element-pdf-link"]', 'View PDF') .should('be.visible') - .and('have.attr', 'href', '/assets/pdfs/baderech.pdf') + .and('have.attr', 'href') + .and('include', '/storage/element-pdfs/baderech.pdf') .and('have.attr', 'target', '_blank') cy.contains('[data-cy="child-element-link"]', introductionAudioTitle) .as('introductionAudioLink')