feature symfony#1058 Use new functional test specific assertions (vor…

…onkovich) This PR was merged into the master branch. Discussion ---------- Use new functional test specific assertions See https://symfony.com/doc/current/testing/functional_tests_assertions.html Commits ------- 8bc4be5 Use new functional test specific assertions
mwebber92 · Jan 3, 2020 · 2227440 · 2227440
2 parents 52ef1b7 + 8bc4be5
commit 2227440
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 30 deletions.
diff --git a/tests/Controller/Admin/BlogControllerTest.php b/tests/Controller/Admin/BlogControllerTest.php
@@ -43,7 +43,8 @@ public function testAccessDeniedForRegularUsers(string $httpMethod, string $url)
         ]);
 
         $client->request($httpMethod, $url);
-        $this->assertSame(Response::HTTP_FORBIDDEN, $client->getResponse()->getStatusCode());
+
+        $this->assertResponseStatusCodeSame(Response::HTTP_FORBIDDEN);
     }
 
     public function getUrlsForRegularUsers()
@@ -62,11 +63,10 @@ public function testAdminBackendHomePage()
         ]);
 
         $crawler = $client->request('GET', '/en/admin/post/');
-        $this->assertSame(Response::HTTP_OK, $client->getResponse()->getStatusCode());
 
-        $this->assertGreaterThanOrEqual(
-            1,
-            $crawler->filter('body#admin_post_index #main tbody tr')->count(),
+        $this->assertResponseIsSuccessful();
+        $this->assertSelectorExists(
+            'body#admin_post_index #main tbody tr',
             'The backend homepage displays all the available posts.'
         );
     }
@@ -95,7 +95,7 @@ public function testAdminNewPost()
         ]);
         $client->submit($form);
 
-        $this->assertSame(Response::HTTP_FOUND, $client->getResponse()->getStatusCode());
+        $this->assertResponseRedirects('/en/admin/post/', Response::HTTP_FOUND);
 
         $post = $client->getContainer()->get('doctrine')->getRepository(Post::class)->findOneBy([
             'title' => $postTitle,
@@ -113,7 +113,7 @@ public function testAdminShowPost()
         ]);
         $client->request('GET', '/en/admin/post/1');
 
-        $this->assertSame(Response::HTTP_OK, $client->getResponse()->getStatusCode());
+        $this->assertResponseIsSuccessful();
     }
 
     /**
@@ -136,7 +136,7 @@ public function testAdminEditPost()
         ]);
         $client->submit($form);
 
-        $this->assertSame(Response::HTTP_FOUND, $client->getResponse()->getStatusCode());
+        $this->assertResponseRedirects('/en/admin/post/1/edit', Response::HTTP_FOUND);
 
         /** @var Post $post */
         $post = $client->getContainer()->get('doctrine')->getRepository(Post::class)->find(1);
@@ -158,7 +158,7 @@ public function testAdminDeletePost()
         $crawler = $client->request('GET', '/en/admin/post/1');
         $client->submit($crawler->filter('#delete-form')->form());
 
-        $this->assertSame(Response::HTTP_FOUND, $client->getResponse()->getStatusCode());
+        $this->assertResponseRedirects('/en/admin/post/', Response::HTTP_FOUND);
 
         $post = $client->getContainer()->get('doctrine')->getRepository(Post::class)->find(1);
         $this->assertNull($post);

diff --git a/tests/Controller/BlogControllerTest.php b/tests/Controller/BlogControllerTest.php
@@ -43,10 +43,7 @@ public function testRss()
         $client = static::createClient();
         $crawler = $client->request('GET', '/en/blog/rss.xml');
 
-        $this->assertSame(
-            'text/xml; charset=UTF-8',
-            $client->getResponse()->headers->get('Content-Type')
-        );
+        $this->assertResponseHeaderSame('Content-Type', 'text/xml; charset=UTF-8');
 
         $this->assertCount(
             Post::NUM_ITEMS,
@@ -92,7 +89,7 @@ public function testAjaxSearch()
 
         $results = json_decode($client->getResponse()->getContent(), true);
 
-        $this->assertSame('application/json', $client->getResponse()->headers->get('Content-Type'));
+        $this->assertResponseHeaderSame('Content-Type', 'application/json');
         $this->assertCount(1, $results);
         $this->assertSame('Lorem ipsum dolor sit amet consectetur adipiscing elit', $results[0]['title']);
         $this->assertSame('Jane Doe', $results[0]['author']);

diff --git a/tests/Controller/DefaultControllerTest.php b/tests/Controller/DefaultControllerTest.php
@@ -39,11 +39,7 @@ public function testPublicUrls(string $url)
         $client = static::createClient();
         $client->request('GET', $url);
 
-        $this->assertSame(
-            Response::HTTP_OK,
-            $client->getResponse()->getStatusCode(),
-            sprintf('The %s public URL loads correctly.', $url)
-        );
+        $this->assertResponseIsSuccessful(sprintf('The %s public URL loads correctly.', $url));
     }
 
     /**
@@ -60,7 +56,7 @@ public function testPublicBlogPost()
         $blogPost = $client->getContainer()->get('doctrine')->getRepository(Post::class)->find(1);
         $client->request('GET', sprintf('/en/blog/posts/%s', $blogPost->getSlug()));
 
-        $this->assertSame(Response::HTTP_OK, $client->getResponse()->getStatusCode());
+        $this->assertResponseIsSuccessful();
     }
 
     /**
@@ -76,10 +72,10 @@ public function testSecureUrls(string $url)
         $client->request('GET', $url);
 
         $response = $client->getResponse();
-        $this->assertSame(Response::HTTP_FOUND, $response->getStatusCode());
-        $this->assertSame(
+
+        $this->assertResponseRedirects(
             'http://localhost/en/login',
-            $response->getTargetUrl(),
+            Response::HTTP_FOUND,
             sprintf('The %s secure URL redirects to the login form.', $url)
         );
     }

diff --git a/tests/Controller/UserControllerTest.php b/tests/Controller/UserControllerTest.php
@@ -41,10 +41,10 @@ public function testAccessDeniedForAnonymousUsers(string $httpMethod, string $ur
         $client->request($httpMethod, $url);
 
         $response = $client->getResponse();
-        $this->assertSame(Response::HTTP_FOUND, $response->getStatusCode());
-        $this->assertSame(
+
+        $this->assertResponseRedirects(
             'http://localhost/en/login',
-            $response->getTargetUrl(),
+            Response::HTTP_FOUND,
             sprintf('The %s secure URL redirects to the login form.', $url)
         );
     }
@@ -69,7 +69,7 @@ public function testEditUser()
         ]);
         $client->submit($form);
 
-        $this->assertSame(Response::HTTP_FOUND, $client->getResponse()->getStatusCode());
+        $this->assertResponseRedirects('/en/profile/edit', Response::HTTP_FOUND);
 
         /** @var User $user */
         $user = $client->getContainer()->get('doctrine')->getRepository(User::class)->findOneBy([
@@ -96,10 +96,10 @@ public function testChangePassword()
         $client->submit($form);
 
         $response = $client->getResponse();
-        $this->assertSame(Response::HTTP_FOUND, $response->getStatusCode());
-        $this->assertSame(
+
+        $this->assertResponseRedirects(
             '/en/logout',
-            $response->getTargetUrl(),
+            Response::HTTP_FOUND,
             'Changing password logout the user.'
         );
     }