aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-11-19 12:55:15 -0500
committerDavid King <imkingdavid@gmail.com>2012-11-19 12:55:15 -0500
commit01ec6085939d74e6a37c3ef041434db1c4b8f3e4 (patch)
tree7632c778aa6f31924d31fadbdaa5af583d777dac /tests/functional
parentf8614bfc84ba9b9cc814b8f78e343005620f18f8 (diff)
downloadforums-01ec6085939d74e6a37c3ef041434db1c4b8f3e4.tar
forums-01ec6085939d74e6a37c3ef041434db1c4b8f3e4.tar.gz
forums-01ec6085939d74e6a37c3ef041434db1c4b8f3e4.tar.bz2
forums-01ec6085939d74e6a37c3ef041434db1c4b8f3e4.tar.xz
forums-01ec6085939d74e6a37c3ef041434db1c4b8f3e4.zip
[feature/controller] Fix comments, check against more general HttpException
PHPBB3-10864
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/extension_controller_test.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index c7b585354e..f28b321942 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -121,7 +121,10 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
$this->phpbb_extension_manager->purge('foo/bar');
}
- public function test_exception_thrown_status_code()
+ /**
+ * Check the status code resulting from an exception thrown by a controller
+ */
+ public function test_exception_should_result_in_500_status_code()
{
$this->phpbb_extension_manager->enable('foo/bar');
$crawler = $this->request('GET', 'app.php?controller=foo/exception');
@@ -142,8 +145,6 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
public function test_error_ext_disabled_or_404()
{
$crawler = $this->request('GET', 'app.php?controller=does/not/exist');
- // This is 500 response because the exception is thrown from within Symfony
- // and does not provide a exception code, so we assign it 500 by default
$this->assertEquals(404, $this->client->getResponse()->getStatus());
$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
}