diff options
| author | David King <imkingdavid@gmail.com> | 2013-03-15 09:49:26 -0700 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-03-15 09:49:26 -0700 |
| commit | aaee4c69d977fe6ebd62f2710c9c0ab90f1af98f (patch) | |
| tree | 0884d8236fd20c3bac3a11bc662a8b74848cf689 /tests | |
| parent | 9157095cdabe629765ab0583f2850c2d4771c1d1 (diff) | |
| parent | 3b0cdc53629c3a852762ae9b96b809cf4b1af2c4 (diff) | |
| download | forums-aaee4c69d977fe6ebd62f2710c9c0ab90f1af98f.tar forums-aaee4c69d977fe6ebd62f2710c9c0ab90f1af98f.tar.gz forums-aaee4c69d977fe6ebd62f2710c9c0ab90f1af98f.tar.bz2 forums-aaee4c69d977fe6ebd62f2710c9c0ab90f1af98f.tar.xz forums-aaee4c69d977fe6ebd62f2710c9c0ab90f1af98f.zip | |
Merge pull request #7 from nickvergessen/ticket/imkingdavid/11334-2
[ticket/11334] Allow parameters to be specified in the route
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/controller/helper_url_test.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/controller/helper_url_test.php b/tests/controller/helper_url_test.php index f27c03501d..195f48d8a9 100644 --- a/tests/controller/helper_url_test.php +++ b/tests/controller/helper_url_test.php @@ -15,7 +15,7 @@ class phpbb_controller_helper_url_test extends phpbb_test_case public function helper_url_data() { return array( - // Unsupported: array('foo/bar?t=1&f=2', false, true, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in url-argument'), + array('foo/bar?t=1&f=2', false, true, false, 'app.php?t=1&f=2&controller=foo/bar', 'parameters in url-argument'), array('foo/bar', 't=1&f=2', true, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in params-argument using amp'), array('foo/bar', 't=1&f=2', false, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in params-argument using &'), array('foo/bar', array('t' => 1, 'f' => 2), true, false, 'app.php?controller=foo/bar&t=1&f=2', 'parameters in params-argument as array'), @@ -24,12 +24,12 @@ class phpbb_controller_helper_url_test extends phpbb_test_case array('foo/bar', 't=1&f=2', true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid', 'using session_id'), // Testing anchors - // Unsupported: array('foo/bar?t=1&f=2#anchor', false, true, false, 'app.php?controller=foo/bar&t=1&f=2#anchor', 'anchor in url-argument'), + array('foo/bar?t=1&f=2#anchor', false, true, false, 'app.php?t=1&f=2&controller=foo/bar#anchor', 'anchor in url-argument'), array('foo/bar', 't=1&f=2#anchor', true, false, 'app.php?controller=foo/bar&t=1&f=2#anchor', 'anchor in params-argument'), array('foo/bar', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, false, 'app.php?controller=foo/bar&t=1&f=2#anchor', 'anchor in params-argument (array)'), // Anchors and custom sid - // Unsupported: array('foo/bar?t=1&f=2#anchor', false, true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid#anchor', 'anchor in url-argument using session_id'), + array('foo/bar?t=1&f=2#anchor', false, true, 'custom-sid', 'app.php?t=1&f=2&controller=foo/bar&sid=custom-sid#anchor', 'anchor in url-argument using session_id'), array('foo/bar', 't=1&f=2#anchor', true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument using session_id'), array('foo/bar', array('t' => 1, 'f' => 2, '#' => 'anchor'), true, 'custom-sid', 'app.php?controller=foo/bar&t=1&f=2&sid=custom-sid#anchor', 'anchor in params-argument (array) using session_id'), |