aboutsummaryrefslogtreecommitdiffstats
path: root/tests/functional
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-11-16 17:36:39 -0500
committerDavid King <imkingdavid@gmail.com>2012-11-16 17:36:39 -0500
commit4efbb893b7b8ada8766847dc59724faef9c18142 (patch)
tree9d9a9823f5a48ac5f302fd7c96f85d9c0a1fbc43 /tests/functional
parentabf2575bdbad84ca2d139290789852ee51efd31c (diff)
downloadforums-4efbb893b7b8ada8766847dc59724faef9c18142.tar
forums-4efbb893b7b8ada8766847dc59724faef9c18142.tar.gz
forums-4efbb893b7b8ada8766847dc59724faef9c18142.tar.bz2
forums-4efbb893b7b8ada8766847dc59724faef9c18142.tar.xz
forums-4efbb893b7b8ada8766847dc59724faef9c18142.zip
[feature/controller] Fix line endings and permissions, and check responses
PHPBB3-10864
Diffstat (limited to 'tests/functional')
-rw-r--r--tests/functional/extension_controller_test.php4
-rw-r--r--[-rwxr-xr-x]tests/functional/fixtures/ext/foo/bar/config/routing.yml0
-rw-r--r--[-rwxr-xr-x]tests/functional/fixtures/ext/foo/bar/config/services.yml0
-rw-r--r--[-rwxr-xr-x]tests/functional/fixtures/ext/foo/bar/controller/controller.php0
-rw-r--r--[-rwxr-xr-x]tests/functional/fixtures/ext/foo/bar/ext.php12
5 files changed, 10 insertions, 6 deletions
diff --git a/tests/functional/extension_controller_test.php b/tests/functional/extension_controller_test.php
index 9cc2e0e32f..ba4a4e8ef0 100644
--- a/tests/functional/extension_controller_test.php
+++ b/tests/functional/extension_controller_test.php
@@ -91,6 +91,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
{
$this->phpbb_extension_manager->enable('foo/bar');
$crawler = $this->request('GET', 'app.php/foo/bar');
+ $this->assert_response_success();
$this->assertContains("foo/bar controller handle() method", $crawler->filter('body')->text());
$this->phpbb_extension_manager->purge('foo/bar');
}
@@ -102,6 +103,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
{
$this->phpbb_extension_manager->enable('foo/bar');
$crawler = $this->request('GET', 'app.php/foo/template');
+ $this->assert_response_success();
$this->assertContains("I am a variable", $crawler->filter('#content')->text());
$this->phpbb_extension_manager->purge('foo/bar');
}
@@ -114,6 +116,7 @@ class phpbb_functional_extension_controller_test extends phpbb_functional_test_c
{
$this->phpbb_extension_manager->enable('foo/bar');
$crawler = $this->request('GET', 'app.php/foo/baz');
+ $this->assertEquals(404, $this->client->getResponse()->getStatus());
$this->assertContains('Missing value for argument #1: test in class phpbb_ext_foo_bar_controller:baz', $crawler->filter('body')->text());
$this->phpbb_extension_manager->purge('foo/bar');
}
@@ -130,6 +133,7 @@ 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/does/not/exist');
+ $this->assertEquals(404, $this->client->getResponse()->getStatus());
$this->assertContains('No route found for "GET /does/not/exist"', $crawler->filter('body')->text());
}
}
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
index 123f5f1b73..123f5f1b73 100755..100644
--- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml
diff --git a/tests/functional/fixtures/ext/foo/bar/config/services.yml b/tests/functional/fixtures/ext/foo/bar/config/services.yml
index 33ced55af9..33ced55af9 100755..100644
--- a/tests/functional/fixtures/ext/foo/bar/config/services.yml
+++ b/tests/functional/fixtures/ext/foo/bar/config/services.yml
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 50ea5d034b..50ea5d034b 100755..100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
diff --git a/tests/functional/fixtures/ext/foo/bar/ext.php b/tests/functional/fixtures/ext/foo/bar/ext.php
index 7170209d53..74359d51ab 100755..100644
--- a/tests/functional/fixtures/ext/foo/bar/ext.php
+++ b/tests/functional/fixtures/ext/foo/bar/ext.php
@@ -1,6 +1,6 @@
-<?php
-
-class phpbb_ext_foo_bar_ext extends phpbb_extension_base
-{
-
-}
+<?php
+
+class phpbb_ext_foo_bar_ext extends phpbb_extension_base
+{
+
+}