aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-03-07 15:14:35 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-03-07 15:14:35 +0100
commit6491477809bf6eed1cf4672e4a6439f24cce3b57 (patch)
treeb28dbbc890ee1cc79e554dbb4f5c183d7aa5b04c /tests
parentecf1e94726a8a1e0f8d30aba3935e1899c2c6adc (diff)
downloadforums-6491477809bf6eed1cf4672e4a6439f24cce3b57.tar
forums-6491477809bf6eed1cf4672e4a6439f24cce3b57.tar.gz
forums-6491477809bf6eed1cf4672e4a6439f24cce3b57.tar.bz2
forums-6491477809bf6eed1cf4672e4a6439f24cce3b57.tar.xz
forums-6491477809bf6eed1cf4672e4a6439f24cce3b57.zip
[ticket/12090] Fix helper usage in functional controller tests
PHPBB3-12090
Diffstat (limited to 'tests')
-rw-r--r--tests/functional/fixtures/ext/foo/bar/controller/controller.php30
1 files changed, 3 insertions, 27 deletions
diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
index 7a52958ab6..36f232baec 100644
--- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php
+++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php
@@ -63,41 +63,17 @@ class controller
'tests/index.php',
),
array(
- $this->helper->url('foo_index_controller'),
+ $this->helper->route('foo_index_controller'),
$rewrite_prefix . 'index',
),
array(
- $this->helper->url('foo_tests_index_controller'),
+ $this->helper->route('foo_tests_index_controller'),
$rewrite_prefix . 'tests/index',
),
array(
- $this->helper->url('foo_tests_dotdot_index_controller'),
+ $this->helper->route('foo_tests_dotdot_index_controller'),
$rewrite_prefix . 'index',
),
- /*
- // helper URLs starting with ../ are prone to failure.
- // Do not test them right now.
- array(
- $this->helper->url('../index'),
- '../index',
- ),
- array(
- $this->helper->url('../../index'),
- '../index',
- ),
- array(
- $this->helper->url('../tests/index'),
- $rewrite_prefix . '../tests/index',
- ),
- array(
- $this->helper->url('../tests/../index'),
- '../index',
- ),
- array(
- $this->helper->url('../../tests/index'),
- '../tests/index',
- ),
- */
);
foreach ($redirects as $redirect)