improved tests

Author: sadikoff

src/GeneratorHelper.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Bundle\MakerBundle;
 
+/**
+ * @author Sadicov Vladimir <[email protected]>
+ */
 class GeneratorHelper
 {
     public function getEntityFieldPrintCode($entity, $field): string

src/Maker/MakeCrud.php

@@ -11,8 +11,9 @@
 
 namespace Symfony\Bundle\MakerBundle\Maker;
 
+use Doctrine\Bundle\DoctrineBundle\DoctrineBundle;
 use Doctrine\Common\Inflector\Inflector;
-use Doctrine\ORM\EntityManager;
+use Doctrine\ORM\Mapping\Column;
 use Psr\Container\ContainerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\MakerBundle\ConsoleStyle;
@@ -111,7 +112,7 @@ public function getFiles(array $params): array
     {
         return [
             __DIR__.'/../Resources/skeleton/crud/controller/Controller.tpl.php' => 'src/Controller/'.$params['controller_class_name'].'.php',
-//            __DIR__.'/../Resources/skeleton/crud/form/Type.tpl.php' => 'src/Form/'.$params['form_class_name'].'.php',
+            __DIR__.'/../Resources/skeleton/crud/form/Type.tpl.php' => 'src/Form/'.$params['form_class_name'].'.php',
             __DIR__.'/../Resources/skeleton/crud/templates/_delete_form.tpl.php' => 'templates/'.$params['route_name'].'/_delete_form.html.twig',
             __DIR__.'/../Resources/skeleton/crud/templates/_form.tpl.php' => 'templates/'.$params['route_name'].'/_form.html.twig',
             __DIR__.'/../Resources/skeleton/crud/templates/index.tpl.php' => 'templates/'.$params['route_name'].'/index.html.twig',
@@ -138,27 +139,29 @@ public function configureDependencies(DependencyBuilder $dependencies)
             'annotations'
         );
 
-//        $dependencies->addClassDependency(
-//            AbstractType::class,
-//            // technically only form is needed, but the user will *probably* also want validation
-//            'form'
-//        );
-//
-//        $dependencies->addClassDependency(
-//            Validation::class,
-//            'validator',
-//            // add as an optional dependency: the user *probably* wants validation
-//            false
-//        );
+        $dependencies->addClassDependency(
+            AbstractType::class,
+            'form'
+        );
+
+        $dependencies->addClassDependency(
+            Validation::class,
+            'validator'
+        );
 
         $dependencies->addClassDependency(
             TwigBundle::class,
             'twig-bundle'
         );
 
         $dependencies->addClassDependency(
-            EntityManager::class,
-            'orm-pack'
+            DoctrineBundle::class,
+            'orm'
+        );
+
+        $dependencies->addClassDependency(
+            Column::class,
+            'orm'
         );
     }
 

tests/Maker/FunctionalTest.php

@@ -254,7 +254,7 @@ public function getCommandTests()
                 $this->assertNotContains('Success', $output);
 
                 $this->assertContains('No database changes were detected', $output);
-            }),
+            })
         ];
 
         yield 'crud' => [MakerTestDetails::createTest(
@@ -264,15 +264,17 @@ public function getCommandTests()
                 'SweetFood',
             ])
             ->setFixtureFilesPath(__DIR__.'/../fixtures/MakeCrud')
+            ->addReplacement(
+                'phpunit.xml.dist',
+                'mysql://db_user:[email protected]:3306/db_name',
+                'sqlite:///%kernel.project_dir%/var/app.db'
+            )
             ->addReplacement(
                 '.env',
                 'mysql://db_user:[email protected]:3306/db_name',
                 'sqlite:///%kernel.project_dir%/var/app.db'
             )
-            ->addExtraDependencies('symfony/orm-pack')
-            ->assert(function (string $output, string $directory) {
-                $this->assertContains('Success', $output);
-            }),
+            ->addPreMakeCommand('./bin/console doctrine:schema:create --env=test')
         ];
     }
 

tests/fixtures/MakeCrud/src/Entity/SweetFood.php

@@ -20,4 +20,20 @@ class SweetFood
      * @ORM\Column(name="title", type="string", length=255)
      */
     private $title;
+
+    /**
+     * @return mixed
+     */
+    public function getTitle()
+    {
+        return $this->title;
+    }
+
+    /**
+     * @param mixed $title
+     */
+    public function setTitle($title)
+    {
+        $this->title = $title;
+    }
 }

tests/fixtures/MakeCrud/tests/GeneratedCrudControllerTest.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\Tests;
+
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class GeneratedCrudControllerTest extends WebTestCase
+{
+    public function testIndexAction()
+    {
+        $client = self::createClient();
+        $client->request('GET', '/sweet/food/');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertContains('<!DOCTYPE html>', $client->getResponse()->getContent());
+        $this->assertContains('SweetFood index', $client->getResponse()->getContent());
+    }
+
+    public function testNewAction()
+    {
+        $client = self::createClient();
+        $client->request('GET', '/sweet/food/new');
+
+        $this->assertEquals(200, $client->getResponse()->getStatusCode());
+        $this->assertContains('<!DOCTYPE html>', $client->getResponse()->getContent());
+        $this->assertContains('New SweetFood', $client->getResponse()->getContent());
+    }
+}