Fixes for issue #248

This commit is contained in:
Simon Sessingø
2017-08-01 21:09:18 +02:00
parent 3a7b27796a
commit 883d8a6b0e
4 changed files with 13 additions and 18 deletions
+10 -12
View File
@@ -10,24 +10,22 @@ class RouterUrlTest extends PHPUnit_Framework_TestCase
public function testOptionalParameters()
{
// TestRouter::get('/aviso/legal', 'DummyController@method1');
TestRouter::get('/aviso/legal', 'DummyController@method1');
TestRouter::get('/aviso/{aviso}', 'DummyController@method1');
//TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
TestRouter::get('/pagina/{pagina}', 'DummyController@method1');
TestRouter::get('/{pagina?}', 'DummyController@method1');
//TestRouter::debugNoReset('/aviso/optional', 'get');
//$this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
TestRouter::debugNoReset('/aviso/optional', 'get');
$this->assertEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
//TestRouter::debugNoReset('/pagina/optional', 'get');
//$this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
TestRouter::debugNoReset('/pagina/optional', 'get');
$this->assertEquals('/pagina/{pagina}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
//TestRouter::debugNoReset('/optional', 'get');
//$this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
TestRouter::debugNoReset('/optional', 'get');
$this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
// New test lines
//TestRouter::debugNoReset('/avisolegal', 'get');
//$this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
TestRouter::debugNoReset('/avisolegal', 'get');
$this->assertNotEquals('/aviso/{aviso}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());
TestRouter::debugNoReset('/avisolegal', 'get');
$this->assertEquals('/{pagina?}/', TestRouter::router()->getRequest()->getLoadedRoute()->getUrl());