Merge 5db128a071 into 54dcb72288

templates/bundles/TwigBundle/Exception/error.html.twig

@@ -15,10 +15,6 @@
             <div class="card-content">
                 <div class="row">
                     <h5>{{ status_code }}: {{ status_text }}</h5>
-                    <p>{{ exception.message }}</p>
-                    {# {% for trace in exception.trace %}
-                        <p>{{ trace.class }} - {{ trace.type }} - {{ trace.file }} - {{ trace.line }}</p>
-                    {% endfor %} #}
                 </div>
             </div>
         </div>

tests/Controller/ConfigControllerTest.php

@@ -1130,7 +1130,7 @@ class ConfigControllerTest extends WallabagTestCase
 
         $this->assertSame(400, $client->getResponse()->getStatusCode());
         $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertStringContainsString('Bad CSRF token.', $body[0]);
+        $this->assertStringContainsString('400: Bad Request', $body[0]);
     }
 
     public function testChangeLocaleWithReferer()

tests/Controller/EntryControllerTest.php

@@ -732,7 +732,7 @@ class EntryControllerTest extends WallabagTestCase
 
         $this->assertSame(400, $client->getResponse()->getStatusCode());
         $this->assertGreaterThan(1, $body = $crawler->filter('body')->extract(['_text']));
-        $this->assertStringContainsString('Bad CSRF token.', $body[0]);
+        $this->assertStringContainsString('400: Bad Request', $body[0]);
     }
 
     /**