From ef7a0bce2a8281f91bff38dccaa5e84c0893c5ae Mon Sep 17 00:00:00 2001 From: Roel Sint Date: Sat, 24 Aug 2013 17:57:26 +0200 Subject: [PATCH] Add image test page and web test case --- .../Controller/PhpcrFileTestController.php | 8 +- .../Controller/PhpcrImageTestController.php | 172 ++++++++++++++++++ .../DataFixtures/Phpcr/LoadMediaData.php | 34 +++- Tests/Resources/Document/Content.php | 69 +++++++ Tests/Resources/app/AppKernel.php | 13 ++ .../Resources/app/Resources/data/cmf-logo.png | Bin 0 -> 18295 bytes .../app/Resources/data/testimage.png | Bin 0 -> 190 bytes .../app/Resources/views/index.html.twig | 1 + .../app/Resources/views/tests/file.html.twig | 2 +- .../app/Resources/views/tests/image.html.twig | 70 +++++++ Tests/Resources/app/config/cmf_media.yml | 6 + .../app/config/routing/cmf_media.yml | 25 ++- Tests/WebTest/TestApp/FileTest.php | 3 +- Tests/WebTest/TestApp/ImageTest.php | 95 ++++++++++ 14 files changed, 487 insertions(+), 11 deletions(-) create mode 100644 Tests/Resources/Controller/PhpcrImageTestController.php create mode 100644 Tests/Resources/Document/Content.php create mode 100644 Tests/Resources/app/Resources/data/cmf-logo.png create mode 100644 Tests/Resources/app/Resources/data/testimage.png create mode 100644 Tests/Resources/app/Resources/views/tests/image.html.twig create mode 100644 Tests/WebTest/TestApp/ImageTest.php diff --git a/Tests/Resources/Controller/PhpcrFileTestController.php b/Tests/Resources/Controller/PhpcrFileTestController.php index fe1e17e..cc3c852 100644 --- a/Tests/Resources/Controller/PhpcrFileTestController.php +++ b/Tests/Resources/Controller/PhpcrFileTestController.php @@ -16,7 +16,7 @@ public function getUploadForm() ; } - public function fileAction(Request $request) + public function indexAction(Request $request) { $fileClass = 'Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\File'; $dm = $this->get('doctrine_phpcr')->getManager('default'); @@ -26,9 +26,9 @@ public function fileAction(Request $request) $editorUploadForm = $this->getUploadForm(); return $this->render('::tests/file.html.twig', array( - 'upload_form' => $uploadForm->createView(), - 'editor_form' => $editorUploadForm->createView(), - 'files' => $files, + 'upload_form' => $uploadForm->createView(), + 'editor_form' => $editorUploadForm->createView(), + 'files' => $files, )); } diff --git a/Tests/Resources/Controller/PhpcrImageTestController.php b/Tests/Resources/Controller/PhpcrImageTestController.php new file mode 100644 index 0000000..c6003ec --- /dev/null +++ b/Tests/Resources/Controller/PhpcrImageTestController.php @@ -0,0 +1,172 @@ +container->get('form.factory')->createNamedBuilder(null, 'form') + ->add('image', 'file') + ->getForm() + ; + } + + protected function getContentForm(Content $contentObject = null, array $imageOptions = array()) + { + if (is_null($contentObject)) { + $contentObject = new Content(); + } + + return $this->createFormBuilder($contentObject) + ->add('name') + ->add('title') + ->add('image', 'cmf_media_image', array_merge(array('required' => false), $imageOptions)) + ->getForm() + ; + } + + protected function getUrlSafePath($object) + { + return ltrim($object->getId(), '/'); + } + + protected function mapUrlSafePathToId($path) + { + // The path is being the id + return PathHelper::absolutizePath($path, '/'); + } + + public function indexAction(Request $request) + { + $dm = $this->get('doctrine_phpcr')->getManager('default'); + + // get image(s) + $imageClass = 'Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\Image'; + $images = $dm->getRepository($imageClass)->findAll(); + + // get content with image object + $contentClass = 'Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Document\Content'; + $contentObject = $dm->getRepository($contentClass)->findOneBy(array()); + + $uploadForm = $this->getUploadForm(); + $editorUploadForm = $this->getUploadForm(); + + // Form - content object with image embedded + $newContentForm = $this->getContentForm(null, array('required' => true)); + $contentForm = $this->getContentForm($contentObject, array('imagine_filter' => false)); + $contentFormImagine = $this->getContentForm($contentObject); + + // action url + if ($contentObject) { + $contentFormEditAction = $this->generateUrl('phpcr_image_test_content_edit', array( + 'path' => $this->getUrlSafePath($contentObject), + )); + } else { + $contentFormEditAction = false; + } + + return $this->render('::tests/image.html.twig', array( + 'upload_form' => $uploadForm->createView(), + 'editor_form' => $editorUploadForm->createView(), + 'content_form_new' => $newContentForm->createView(), + 'content_form' => $contentForm->createView(), + 'content_form_imagine' => $contentFormImagine->createView(), + 'content_form_edit_action' => $contentFormEditAction, + 'images' => $images, + )); + } + + public function uploadAction(Request $request) + { + $form = $this->getUploadForm(); + + if ($request->isMethod('POST')) { + $form->bind($request); + + if ($form->isValid()) { + /** @var UploadFileHelper $uploadFileHelper */ + $uploadImageHelper = $this->get('cmf_media.upload_image_helper'); + + $uploadedFile = $request->files->get('image'); + + $image = $uploadImageHelper->handleUploadedFile($uploadedFile); + + // persist + $dm = $this->get('doctrine_phpcr')->getManager('default'); + $dm->persist($image); + $dm->flush(); + } + } + + return $this->redirect($this->generateUrl('phpcr_image_test')); + } + + public function newAction(Request $request) + { + $dm = $this->get('doctrine_phpcr')->getManager('default'); + $contentRoot = $dm->find(null, '/test/content'); + + if (!$contentRoot) { + $root = $dm->find(null, '/test'); + $contentRoot = new Generic(); + $contentRoot->setNodename('content'); + $contentRoot->setParent($root); + $dm->persist($contentRoot); + } + + $contentObject = new Content(); + $contentObject->setParent($contentRoot); + + $form = $this->getContentForm($contentObject); + + if ($request->isMethod('POST')) { + $form->bind($request); + + if ($form->isValid()) { + // persist + $dm = $this->get('doctrine_phpcr')->getManager('default'); + $dm->persist($contentObject); + $dm->flush(); + } + } + + return $this->redirect($this->generateUrl('phpcr_image_test')); + } + + public function editAction(Request $request, $path) + { + $dm = $this->get('doctrine_phpcr')->getManager('default'); + + $contentObject = $dm->find(null, $this->mapUrlSafePathToId($path)); + + if (!$contentObject || !$contentObject instanceof Content) { + throw new NotFoundHttpException(sprintf( + 'Object with identifier %s cannot be resolved to a valid instance of Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Document\Content', + $path + )); + } + + $form = $this->getContentForm($contentObject); + + if ($request->isMethod('POST')) { + $form->bind($request); + + if ($form->isValid()) { + // persist + $dm = $this->get('doctrine_phpcr')->getManager('default'); + $dm->persist($contentObject); + $dm->flush(); + } + } + + return $this->redirect($this->generateUrl('phpcr_image_test')); + } +} diff --git a/Tests/Resources/DataFixtures/Phpcr/LoadMediaData.php b/Tests/Resources/DataFixtures/Phpcr/LoadMediaData.php index e798966..f803f52 100644 --- a/Tests/Resources/DataFixtures/Phpcr/LoadMediaData.php +++ b/Tests/Resources/DataFixtures/Phpcr/LoadMediaData.php @@ -7,6 +7,8 @@ use Doctrine\Common\Persistence\ObjectManager; use Doctrine\ODM\PHPCR\Document\Generic; use Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\File; +use Symfony\Cmf\Bundle\MediaBundle\Doctrine\Phpcr\Image; +use Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Document\Content; class LoadMediaData implements FixtureInterface, DependentFixtureInterface { @@ -19,12 +21,22 @@ public function getDependencies() public function load(ObjectManager $manager) { + $testDataDir = realpath(__DIR__ . '/../../app/Resources/data'); + $root = $manager->find(null, '/test'); - $mediaRoot = new Generic; + + // media root + $mediaRoot = new Generic(); $mediaRoot->setNodename('media'); $mediaRoot->setParent($root); $manager->persist($mediaRoot); + // content root + $contentRoot = new Generic(); + $contentRoot->setNodename('content'); + $contentRoot->setParent($root); + $manager->persist($contentRoot); + // File $file = new File(); $file->setParent($mediaRoot); @@ -33,6 +45,26 @@ public function load(ObjectManager $manager) $file->setContentType('text/plain'); $manager->persist($file); + // Image + $image = new Image(); + $image->setParent($mediaRoot); + $image->setName('cmf-logo.png'); + $image->setFileContentFromFilesystem($testDataDir .'/cmf-logo.png'); + $manager->persist($image); + + // Content + $content = new Content(); + $content->setParent($contentRoot); + $content->setName('content-with-image'); + $content->setTitle('Content document with image embedded'); + + $contentImage = new Image(); + $contentImage->setName('cmf-logo.png'); + $contentImage->setFileContentFromFilesystem($testDataDir .'/cmf-logo.png'); + + $content->setImage($contentImage); + $manager->persist($content); + $manager->flush(); } } diff --git a/Tests/Resources/Document/Content.php b/Tests/Resources/Document/Content.php new file mode 100644 index 0000000..96db7e0 --- /dev/null +++ b/Tests/Resources/Document/Content.php @@ -0,0 +1,69 @@ +image) { + // existing image, only update content + // TODO: https://github.com/doctrine/phpcr-odm/pull/262 + $this->image->copyContentFromFile($image); + } elseif ($image instanceof ImageInterface) { + $this->image = $image; + } else { + $this->image = new Image(); + $this->image->copyContentFromFile($image); + } + } + + /** + * Get image + * + * @return Image + */ + public function getImage() + { + return $this->image; + } +} \ No newline at end of file diff --git a/Tests/Resources/app/AppKernel.php b/Tests/Resources/app/AppKernel.php index 3fea41f..103315b 100644 --- a/Tests/Resources/app/AppKernel.php +++ b/Tests/Resources/app/AppKernel.php @@ -23,4 +23,17 @@ public function registerContainerConfiguration(LoaderInterface $loader) { $loader->load(__DIR__.'/config/config.php'); } + + /** + * Returns the kernel parameters. + * + * @return array An array of kernel parameters + */ + protected function getKernelParameters() + { + return array_merge( + parent::getKernelParameters(), + array('kernel.cmf_test_web_dir' => CMF_TEST_ROOT_DIR . DIRECTORY_SEPARATOR . 'resources' . DIRECTORY_SEPARATOR . 'web') + ); + } } diff --git a/Tests/Resources/app/Resources/data/cmf-logo.png b/Tests/Resources/app/Resources/data/cmf-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..074313b84bbe2ceecdcb24f761f763aa07a01327 GIT binary patch literal 18295 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 az5V8|nVuRi<$y=zFnGH9xvXPhpcr

About

This test application is built into the MediaBundle. You can easily run diff --git a/Tests/Resources/app/Resources/views/tests/file.html.twig b/Tests/Resources/app/Resources/views/tests/file.html.twig index 01f39fe..e0e1c5b 100644 --- a/Tests/Resources/app/Resources/views/tests/file.html.twig +++ b/Tests/Resources/app/Resources/views/tests/file.html.twig @@ -25,7 +25,7 @@ {% else %}

{% endif %} diff --git a/Tests/Resources/app/Resources/views/tests/image.html.twig b/Tests/Resources/app/Resources/views/tests/image.html.twig new file mode 100644 index 0000000..f420dce --- /dev/null +++ b/Tests/Resources/app/Resources/views/tests/image.html.twig @@ -0,0 +1,70 @@ +{% extends "::layout.html.twig" %} +{% block content %} +

Upload image

+ +

Standard upload

+

The upload is handled by your own controller action. The UploadFileHelper is used to handle the upload and creates a + FileInterface object, writing the object to storage has to be implemented by yourself.

+
+ {{ form_widget(upload_form) }} + + +
+ +

Web editor upload (default)

+

The upload is completely handled by the ImageController::uploadAction. The UploadFileHelper will process the upload, + writes the created FileInterface object to storage and returns a response that depends on the editor defined in the + request.

+
+ {{ form_widget(editor_form) }} + + +
+ +

Content object with an image embedded (new)

+

This will use the cmf_media_image form type.

+
+ {{ form_widget(content_form_new) }} + + +
+ + {% if content_form_edit_action %} +

Content object with an image embedded (edit)

+

This will use the cmf_media_image form type that will show a preview of the uploaded image.

+
+ {{ form_widget(content_form) }} + + +
+ +

Content object with an image embedded (edit) - using LiipImagineBundle for the image preview

+

This will use the cmf_media_image form type that will show a preview of the uploaded image.

+
+ {{ form_widget(content_form_imagine) }} + + +
+ {% endif %} + +

Display image(s)

+ {% if images is empty %} +

No images found, upload an image first.

+ {% else %} +
    + {% for image in images %} +
  • +

    {{ image.name }} (id: {{ image.id }})

    +

    Using the ImageController::displayAction: + {{ '{{' }} cmf_media_display_url(image) {{ '}}' }}

    +

    {{ image.description }}

    + +

    Using LiipImagineBundle:
    + {{ '{{' }} cmf_media_display_url(image, { imagine_filter: 'image_upload_thumbnail' }) {{ '}}' }} + or {{ '{{' }} image.id | imagine_filter('image_upload_thumbnail') {{ '}}' }}

    +

    {{ image.description }}

    +
    • + {% endfor %} +
+ {% endif %} +{% endblock %} diff --git a/Tests/Resources/app/config/cmf_media.yml b/Tests/Resources/app/config/cmf_media.yml index 6482d85..e42ab7c 100644 --- a/Tests/Resources/app/config/cmf_media.yml +++ b/Tests/Resources/app/config/cmf_media.yml @@ -1,3 +1,8 @@ +twig: + form: + resources: + - 'CmfMediaBundle:Form:fields.html.twig' + cmf_media: persistence: phpcr: @@ -8,6 +13,7 @@ cmf_media: # to a specific format. (ie a controller render the file) # more information can be found here : https://github.com/liip/LiipImagineBundle liip_imagine: + web_root: %kernel.cmf_test_web_dir% filter_sets: # define the filter to be used with the image preview image_upload_thumbnail: diff --git a/Tests/Resources/app/config/routing/cmf_media.yml b/Tests/Resources/app/config/routing/cmf_media.yml index df944ab..cf2a02b 100644 --- a/Tests/Resources/app/config/routing/cmf_media.yml +++ b/Tests/Resources/app/config/routing/cmf_media.yml @@ -6,17 +6,34 @@ test_index: phpcr_file_test: pattern: /phpcr/file-test defaults: - _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrFileTestController::fileAction + _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrFileTestController::indexAction phpcr_file_test_upload: pattern: /phpcr/file-test/upload defaults: _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrFileTestController::uploadAction -phpcr_file_test_upload_editor: - pattern: /phpcr/file-test/upload/editor +phpcr_image_test: + pattern: /phpcr/image-test defaults: - _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrFileTestController::editorUploadAction + _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrImageTestController::indexAction + +phpcr_image_test_upload: + pattern: /phpcr/image-test/upload + defaults: + _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrImageTestController::uploadAction + +phpcr_image_test_content_new: + pattern: /phpcr/image-test/content/new + defaults: + _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrImageTestController::newAction + +phpcr_image_test_content_edit: + pattern: /phpcr/image-test/content/edit/{path} + defaults: + _controller: Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\Controller\PhpcrImageTestController::editAction + requirements: + path: .* cmf_media_file: resource: "@CmfMediaBundle/Resources/config/routing/file.xml" diff --git a/Tests/WebTest/TestApp/FileTest.php b/Tests/WebTest/TestApp/FileTest.php index 9981864..877c959 100644 --- a/Tests/WebTest/TestApp/FileTest.php +++ b/Tests/WebTest/TestApp/FileTest.php @@ -24,7 +24,8 @@ public function testPage() $resp = $client->getResponse(); $this->assertEquals(200, $resp->getStatusCode()); - $this->assertGreaterThanOrEqual(1, $crawler->filter('.downloads li a')->count()); + // 1 file and 1 image + $this->assertGreaterThanOrEqual(2, $crawler->filter('.downloads li a')->count()); } public function testUpload() diff --git a/Tests/WebTest/TestApp/ImageTest.php b/Tests/WebTest/TestApp/ImageTest.php new file mode 100644 index 0000000..bc79cd0 --- /dev/null +++ b/Tests/WebTest/TestApp/ImageTest.php @@ -0,0 +1,95 @@ +db('PHPCR')->loadFixtures(array( + 'Symfony\Cmf\Bundle\MediaBundle\Tests\Resources\DataFixtures\Phpcr\LoadMediaData', + )); + $this->testDataDir = $this->getContainer()->get('kernel')->getRootDir() . '/Resources/data'; + } + + public function testPage() + { + $client = $this->createClient(); + $crawler = $client->request('get', $this->getContainer()->get('router')->generate('phpcr_image_test')); + $resp = $client->getResponse(); + + $this->assertEquals(200, $resp->getStatusCode()); + + // image(s) display + $this->assertGreaterThanOrEqual(4, $crawler->filter('.images li img')->count()); + + // cmf_media_image form tests + $this->assertEquals(0, $crawler->filter('.cmf_media_image.new img')->count()); + $this->assertEquals(1, $crawler->filter('.cmf_media_image.edit.default img')->count()); + $this->assertEquals(1, $crawler->filter('.cmf_media_image.edit.imagine img')->count()); + + // cmf_media_display_url + $defaultImageLink = $crawler->filter('.images li img.default')->first()->attr('src'); + $client->request('get', $defaultImageLink); + $this->assertEquals(200, $client->getResponse()->getStatusCode(), 'default image test'); + + // imagine_filter + $this->getContainer()->get('liip_imagine.cache.clearer')->clear('image_upload_thumb'); + $imagineImageLink = $crawler->filter('.images li img.imagine')->first()->attr('src'); + $client->request('get', $imagineImageLink); + $this->assertTrue($client->getResponse()->isSuccessful(), 'imagine image test'); + } + + public function testUpload() + { + $client = $this->createClient(); + $crawler = $client->request('get', $this->getContainer()->get('router')->generate('phpcr_image_test')); + $cntImagesLinks = $crawler->filter('.images li img')->count(); + + $buttonCrawlerNode = $crawler->filter('form.standard')->selectButton('submit'); + $form = $buttonCrawlerNode->form(); + $form['image']->upload($this->testDataDir . '/testimage.png'); + + $client->submit($form); + $crawler = $client->followRedirect(); + $resp = $client->getResponse(); + + $this->assertEquals(200, $resp->getStatusCode()); + $this->assertEquals($cntImagesLinks + 2, $crawler->filter('.images li img')->count()); + } + + public function testEditorUpload() + { + $client = $this->createClient(array(), array( + 'PHP_AUTH_USER' => 'admin', + 'PHP_AUTH_PW' => 'adminpass', + )); + $crawler = $client->request('get', $this->getContainer()->get('router')->generate('phpcr_image_test')); + $cntImagesLinks = $crawler->filter('.images li img')->count(); + + $buttonCrawlerNode = $crawler->filter('form.editor.default')->selectButton('submit'); + $form = $buttonCrawlerNode->form(); + $form['image']->upload($this->testDataDir . '/testimage.png'); + + $client->submit($form); + $crawler = $client->followRedirect(); + /** @var Response $resp */ + $resp = $client->getResponse(); + + $this->assertEquals(200, $resp->getStatusCode()); + $this->assertNotEmpty($resp->getContent()); + $this->assertEquals('image/png', $resp->headers->get('Content-Type')); // check that the response is an image + + $crawler = $client->request('get', $this->getContainer()->get('router')->generate('phpcr_image_test')); + $resp = $client->getResponse(); + $this->assertEquals(200, $resp->getStatusCode()); + $this->assertEquals($cntImagesLinks + 2, $crawler->filter('.images li img')->count()); + } +}