Helper refactoring

This commit is contained in:
Frederic Guillot
2016-03-04 20:10:34 -05:00
parent f32507d423
commit 8f3e2b2e5c
141 changed files with 562 additions and 445 deletions

View File

@@ -0,0 +1,17 @@
<?php
require_once __DIR__.'/../Base.php';
use Kanboard\Core\Helper;
class HelperTest extends Base
{
public function testRegister()
{
$helper = new Helper($this->container);
$helper->register('foobar', '\Stdclass');
$this->assertInstanceOf('Stdclass', $helper->foobar);
$this->assertInstanceOf('Stdclass', $helper->getHelper('foobar'));
}
}

View File

@@ -40,21 +40,25 @@ namespace {
$this->assertEquals('userImport', $dispatcher->sanitize('userImport', 'default'));
}
public function testGetPath()
public function testGetPathWithFolder()
{
$dispatcher = new Router($this->container);
$this->container['helper'] = new Helper($this->container);
$router = new Router($this->container);
$this->container['request'] = new Request($this->container, array('PHP_SELF' => '/index.php', 'REQUEST_URI' => '/a/b/c', 'REQUEST_METHOD' => 'GET'));
$this->assertEquals('a/b/c', $dispatcher->getPath());
$this->assertEquals('a/b/c', $router->getPath());
}
$this->container['helper'] = new Helper($this->container);
public function testGetPathWithQueryString()
{
$router = new Router($this->container);
$this->container['request'] = new Request($this->container, array('PHP_SELF' => '/index.php', 'REQUEST_URI' => '/a/b/something?test=a', 'QUERY_STRING' => 'test=a', 'REQUEST_METHOD' => 'GET'));
$this->assertEquals('a/b/something', $dispatcher->getPath());
$this->assertEquals('a/b/something', $router->getPath());
}
$this->container['helper'] = new Helper($this->container);
public function testGetPathWithSubFolderAndQueryString()
{
$router = new Router($this->container);
$this->container['request'] = new Request($this->container, array('PHP_SELF' => '/a/index.php', 'REQUEST_URI' => '/a/b/something?test=a', 'QUERY_STRING' => 'test=a', 'REQUEST_METHOD' => 'GET'));
$this->assertEquals('b/something', $dispatcher->getPath());
$this->assertEquals('b/something', $router->getPath());
}
public function testDispatcherWithControllerNotFound()

View File

@@ -8,7 +8,7 @@ class TemplateTest extends Base
{
public function testGetTemplateFile()
{
$t = new Template($this->container);
$t = new Template($this->container['helper']);
$this->assertStringEndsWith(
'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'a'.DIRECTORY_SEPARATOR.'b.php',
$t->getTemplateFile('a'.DIRECTORY_SEPARATOR.'b')
@@ -17,7 +17,7 @@ class TemplateTest extends Base
public function testGetPluginTemplateFile()
{
$t = new Template($this->container);
$t = new Template($this->container['helper']);
$this->assertStringEndsWith(
'app'.DIRECTORY_SEPARATOR.'Core'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'plugins'.DIRECTORY_SEPARATOR.'Myplugin'.DIRECTORY_SEPARATOR.'Template'.DIRECTORY_SEPARATOR.'a'.DIRECTORY_SEPARATOR.'b.php',
$t->getTemplateFile('myplugin:a'.DIRECTORY_SEPARATOR.'b')
@@ -26,7 +26,7 @@ class TemplateTest extends Base
public function testGetOverridedTemplateFile()
{
$t = new Template($this->container);
$t = new Template($this->container['helper']);
$t->setTemplateOverride('a'.DIRECTORY_SEPARATOR.'b', 'myplugin:c');
$this->assertStringEndsWith(