Tweaks

Author: javiereguiluz

app/AppKernel.php

@@ -35,9 +35,9 @@ public function registerBundles()
             $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle();
             $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle();
 
-            if ($this->getEnvironment() === 'test') {
-                // this bundle is used to have isolated phpunit tests when interacting with doctrine & the database
-                // and is therefore only loaded for the 'test' environment
+            if ('test' === $this->getEnvironment()) {
+                // this bundle makes it easier to work with databases in PHPUnit
+                // tests, so it's only loaded for the 'test' environment
                 $bundles[] = new DAMA\DoctrineTestBundle\DAMADoctrineTestBundle();
             }
         }

app/Resources/views/admin/blog/_delete_form.html.twig

@@ -1,5 +1,5 @@
 {{ include('blog/_delete_post_confirmation.html.twig') }}
-<form action="{{ url('admin_post_delete', { id: post.id }) }}" method="post" data-confirmation="true">
+<form action="{{ url('admin_post_delete', { id: post.id }) }}" method="post" data-confirmation="true" id="delete-form">
     <input type="hidden" name="token" value="{{ csrf_token('delete') }}" />
     <input type="submit" value="{{ 'action.delete_post'|trans }}" class="btn btn-lg btn-block btn-danger" />
 </form>

composer.json

@@ -31,11 +31,11 @@
         "white-october/pagerfanta-bundle"      : "^1.0"
     },
     "require-dev": {
-        "dama/doctrine-test-bundle": "^1.0",
-        "friendsofphp/php-cs-fixer": "^2.0",
-        "phpunit/phpunit": "^4.8 || ^5.0",
-        "sensio/generator-bundle": "^3.0",
-        "symfony/phpunit-bridge": "^3.0"
+        "dama/doctrine-test-bundle"            : "^1.0",
+        "friendsofphp/php-cs-fixer"            : "^2.0",
+        "phpunit/phpunit"                      : "^4.8 || ^5.0",
+        "sensio/generator-bundle"              : "^3.0",
+        "symfony/phpunit-bridge"               : "^3.0"
     },
     "scripts": {
         "symfony-scripts": [

phpunit.xml.dist

@@ -30,6 +30,8 @@
     </filter>
 
     <listeners>
+        <!-- it begins a database transaction before every testcase and rolls it back after
+             the test finished, so tests can manipulate the database without affecting other tests -->
         <listener class="\DAMA\DoctrineTestBundle\PHPUnit\PHPUnitStaticDbConnectionListener" />
     </listeners>
 </phpunit>

tests/AppBundle/Controller/Admin/BlogControllerTest.php

@@ -80,44 +80,44 @@ public function testAdminBackendHomePage()
     }
 
     /**
-     * This test will manipulate the database state by deleting a Post.
-     * All changes to the database are rolled back before the next test case is executed.
-     * This is done by using https://github.com/dmaicher/doctrine-test-bundle.
-     *
-     * Therefore in the following test case we can edit the Post with ID=1 although we deleted it in this test.
+     * This test changes the database contents by deleting a blog post. However,
+     * thanks to the DAMADoctrineTestBundle and its PRPUnit listener, all changes
+     * to the database are rolled back when this test completes. This means that
+     * all the application tests begin with the same database contents.
      */
     public function testAdminDeletePost()
     {
         $client = $this->getAdminClient();
-
         $crawler = $client->request('GET', '/en/admin/post/1');
-
-        $client->submit($crawler->filter('form')->form());
+        $client->submit($crawler->filter('#delete-form')->form());
 
         $this->assertSame(Response::HTTP_FOUND, $client->getResponse()->getStatusCode());
 
         $post = $client->getContainer()->get('doctrine')->getRepository(Post::class)->find(1);
         $this->assertNull($post);
     }
 
+    /**
+     * This test changes the database contents by editing a blog post. However,
+     * thanks to the DAMADoctrineTestBundle and its PRPUnit listener, all changes
+     * to the database are rolled back when this test completes. This means that
+     * all the application tests begin with the same database contents.
+     */
     public function testAdminEditPost()
     {
-        $client = $this->getAdminClient();
+        $newBlogPostTitle = 'Blog Post Title '.mt_rand();
 
+        $client = $this->getAdminClient();
         $crawler = $client->request('GET', '/en/admin/post/1/edit');
-
-        $newTitle = 'what a nice new title!';
-
-        $form = $crawler->filter('form')->form([
-            'post[title]' => $newTitle,
+        $form = $crawler->selectButton('Save changes')->form([
+            'post[title]' => $newBlogPostTitle,
         ]);
-
         $client->submit($form);
 
         $this->assertSame(Response::HTTP_FOUND, $client->getResponse()->getStatusCode());
 
         /** @var Post $post */
         $post = $client->getContainer()->get('doctrine')->getRepository(Post::class)->find(1);
-        $this->assertSame($newTitle, $post->getTitle());
+        $this->assertSame($newBlogPostTitle, $post->getTitle());
     }
 }