diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-07 12:42:06 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-07 14:07:45 +0100 |
| commit | ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc (patch) | |
| tree | 9741193dbe144ed3635e18095fc110272acc3d42 /tests/functional | |
| parent | 51273f6fb1421b68c1931c3960f68cd483f1ee95 (diff) | |
| download | forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar.gz forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar.bz2 forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.tar.xz forums-ecf1e94726a8a1e0f8d30aba3935e1899c2c6adc.zip | |
[ticket/12090] Change redirect tests to use route()
PHPBB3-12090
Diffstat (limited to 'tests/functional')
| -rw-r--r-- | tests/functional/fixtures/ext/foo/bar/config/routing.yml | 12 | ||||
| -rw-r--r-- | tests/functional/fixtures/ext/foo/bar/controller/controller.php | 6 |
2 files changed, 15 insertions, 3 deletions
diff --git a/tests/functional/fixtures/ext/foo/bar/config/routing.yml b/tests/functional/fixtures/ext/foo/bar/config/routing.yml index 9b1ce3cfd7..d4d256c293 100644 --- a/tests/functional/fixtures/ext/foo/bar/config/routing.yml +++ b/tests/functional/fixtures/ext/foo/bar/config/routing.yml @@ -17,3 +17,15 @@ foo_exception_controller: foo_redirect_controller: pattern: /foo/redirect defaults: { _controller: foo_bar.controller:redirect } + +foo_index_controller: + pattern: /index + defaults: { _controller: foo_bar.controller:redirect } + +foo_tests_index_controller: + pattern: /tests/index + defaults: { _controller: foo_bar.controller:redirect } + +foo_tests_dotdot_index_controller: + pattern: /tests/../index + defaults: { _controller: foo_bar.controller:redirect } diff --git a/tests/functional/fixtures/ext/foo/bar/controller/controller.php b/tests/functional/fixtures/ext/foo/bar/controller/controller.php index 558b202948..7a52958ab6 100644 --- a/tests/functional/fixtures/ext/foo/bar/controller/controller.php +++ b/tests/functional/fixtures/ext/foo/bar/controller/controller.php @@ -63,15 +63,15 @@ class controller 'tests/index.php', ), array( - $this->helper->url('index'), + $this->helper->url('foo_index_controller'), $rewrite_prefix . 'index', ), array( - $this->helper->url('tests/index'), + $this->helper->url('foo_tests_index_controller'), $rewrite_prefix . 'tests/index', ), array( - $this->helper->url('tests/../index'), + $this->helper->url('foo_tests_dotdot_index_controller'), $rewrite_prefix . 'index', ), /* |