Merge pull request #1 from fguillot/master

please merge

4 files changed, 339 insertions, 83 deletions

diff --git a/tests/units/Core/Http/RouteTest.php b/tests/units/Core/Http/RouteTest.php
new file mode 100644
index 00000000..5e44ad00
--- /dev/null
+++ b/tests/units/Core/Http/RouteTest.php
@@ -0,0 +1,79 @@
+<?php
+
+require_once __DIR__.'/../../Base.php';
+
+use Kanboard\Core\Http\Route;
+
+class RouteTest extends Base
+{
+    public function testFindParams()
+    {
+        $route = new Route($this->container);
+        $route->enable();
+
+        $this->assertEquals(array('p1' => true, 'p2' => true), $route->findParams(array('something', ':p1', ':p2')));
+        $this->assertEquals(array('p1' => true), $route->findParams(array('something', ':p1', '')));
+        $this->assertEquals(array('p1' => true), $route->findParams(array('something', ':p1', 'something else')));
+    }
+
+    public function testFindRoute()
+    {
+        $route = new Route($this->container);
+        $route->enable();
+
+        $route->addRoute('/mycontroller/myaction', 'mycontroller', 'myaction');
+        $this->assertEquals(
+            array('controller' => 'mycontroller', 'action' => 'myaction', 'plugin' => ''),
+            $route->findRoute('/mycontroller/myaction')
+        );
+
+        $route->addRoute('/a/b/c', 'mycontroller', 'myaction', 'myplugin');
+        $this->assertEquals(
+            array('controller' => 'mycontroller', 'action' => 'myaction', 'plugin' => 'myplugin'),
+            $route->findRoute('/a/b/c')
+        );
+
+        $this->assertEquals(
+            array('controller' => 'app', 'action' => 'index', 'plugin' => ''),
+            $route->findRoute('/notfound')
+        );
+
+        $route->addRoute('/a/b/:c', 'mycontroller', 'myaction', 'myplugin');
+        $this->assertEquals(
+            array('controller' => 'mycontroller', 'action' => 'myaction', 'plugin' => 'myplugin'),
+            $route->findRoute('/a/b/myvalue')
+        );
+
+        $this->assertEquals('myvalue', $this->container['request']->getStringParam('c'));
+
+        $route->addRoute('/a/:p1/b/:p2', 'mycontroller', 'myaction');
+        $this->assertEquals(
+            array('controller' => 'mycontroller', 'action' => 'myaction', 'plugin' => ''),
+            $route->findRoute('/a/v1/b/v2')
+        );
+
+        $this->assertEquals('v1', $this->container['request']->getStringParam('p1'));
+        $this->assertEquals('v2', $this->container['request']->getStringParam('p2'));
+    }
+
+    public function testFindUrl()
+    {
+        $route = new Route($this->container);
+        $route->enable();
+        $route->addRoute('a/b', 'controller1', 'action1');
+        $route->addRoute('a/:myvar1/b/:myvar2', 'controller2', 'action2');
+        $route->addRoute('/something', 'controller1', 'action1', 'myplugin');
+        $route->addRoute('/myplugin/myroute', 'controller1', 'action2', 'myplugin');
+        $route->addRoute('/foo/:myvar', 'controller1', 'action3', 'myplugin');
+
+        $this->assertEquals('a/1/b/2', $route->findUrl('controller2', 'action2', array('myvar1' => 1, 'myvar2' => 2)));
+        $this->assertEquals('', $route->findUrl('controller2', 'action2', array('myvar1' => 1)));
+        $this->assertEquals('a/b', $route->findUrl('controller1', 'action1'));
+        $this->assertEquals('', $route->findUrl('controller1', 'action2'));
+
+        $this->assertEquals('myplugin/myroute', $route->findUrl('controller1', 'action2', array(), 'myplugin'));
+        $this->assertEquals('something', $route->findUrl('controller1', 'action1', array(), 'myplugin'));
+        $this->assertEquals('foo/123', $route->findUrl('controller1', 'action3', array('myvar' => 123), 'myplugin'));
+        $this->assertEquals('foo/123', $route->findUrl('controller1', 'action3', array('myvar' => 123, 'plugin' => 'myplugin')));
+    }
+}
diff --git a/tests/units/Core/Http/RouterTest.php b/tests/units/Core/Http/RouterTest.php
index c2380247..0b200ab5 100644
--- a/tests/units/Core/Http/RouterTest.php
+++ b/tests/units/Core/Http/RouterTest.php
@@ -1,81 +1,203 @@
 <?php
 
-require_once __DIR__.'/../../Base.php';
+namespace Kanboard\Controller {
 
-use Kanboard\Core\Http\Router;
+    class FakeController {
+        public function beforeAction() {}
+        public function myAction() {}
+    }
+}
 
-class RouterTest extends Base
-{
-    public function testSanitize()
-    {
-        $r = new Router($this->container);
-
-        $this->assertEquals('PloP', $r->sanitize('PloP', 'default'));
-        $this->assertEquals('default', $r->sanitize('', 'default'));
-        $this->assertEquals('default', $r->sanitize('123-AB', 'default'));
-        $this->assertEquals('default', $r->sanitize('R&D', 'default'));
-        $this->assertEquals('Test123', $r->sanitize('Test123', 'default'));
-        $this->assertEquals('Test_123', $r->sanitize('Test_123', 'default'));
-        $this->assertEquals('userImport', $r->sanitize('userImport', 'default'));
+namespace Kanboard\Plugin\Myplugin\Controller {
+
+    class FakeController {
+        public function beforeAction() {}
+        public function myAction() {}
     }
+}
 
-    public function testPath()
+namespace {
+
+    require_once __DIR__.'/../../Base.php';
+
+    use Kanboard\Core\Helper;
+    use Kanboard\Core\Http\Route;
+    use Kanboard\Core\Http\Router;
+    use Kanboard\Core\Http\Request;
+
+    class RouterTest extends Base
     {
-        $r = new Router($this->container);
+        public function testSanitize()
+        {
+            $dispatcher = new Router($this->container);
 
-        $this->assertEquals('a/b/c', $r->getPath('/a/b/c'));
-        $this->assertEquals('a/b/something', $r->getPath('/a/b/something?test=a', 'test=a'));
+            $this->assertEquals('PloP', $dispatcher->sanitize('PloP', 'default'));
+            $this->assertEquals('default', $dispatcher->sanitize('', 'default'));
+            $this->assertEquals('default', $dispatcher->sanitize('123-AB', 'default'));
+            $this->assertEquals('default', $dispatcher->sanitize('R&D', 'default'));
+            $this->assertEquals('Test123', $dispatcher->sanitize('Test123', 'default'));
+            $this->assertEquals('Test_123', $dispatcher->sanitize('Test_123', 'default'));
+            $this->assertEquals('userImport', $dispatcher->sanitize('userImport', 'default'));
+        }
 
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        $_SERVER['PHP_SELF'] = '/a/index.php';
+        public function testGetPath()
+        {
+            $dispatcher = new Router($this->container);
 
-        $this->assertEquals('b/c', $r->getPath('/a/b/c'));
-        $this->assertEquals('b/c', $r->getPath('/a/b/c?e=f', 'e=f'));
-    }
+            $this->container['helper'] = new Helper($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());
 
-    public function testFindRouteWithEmptyTable()
-    {
-        $r = new Router($this->container);
-        $this->assertEquals(array('app', 'index'), $r->findRoute(''));
-        $this->assertEquals(array('app', 'index'), $r->findRoute('/'));
-    }
+            $this->container['helper'] = new Helper($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());
 
-    public function testFindRouteWithoutPlaceholders()
-    {
-        $r = new Router($this->container);
-        $r->addRoute('a/b', 'controller', 'action');
-        $this->assertEquals(array('app', 'index'), $r->findRoute('a/b/c'));
-        $this->assertEquals(array('controller', 'action'), $r->findRoute('a/b'));
-    }
+            $this->container['helper'] = new Helper($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());
+        }
 
-    public function testFindRouteWithPlaceholders()
-    {
-        $r = new Router($this->container);
-        $r->addRoute('a/:myvar1/b/:myvar2', 'controller', 'action');
-        $this->assertEquals(array('app', 'index'), $r->findRoute('a/123/b'));
-        $this->assertEquals(array('controller', 'action'), $r->findRoute('a/456/b/789'));
-        $this->assertEquals(array('myvar1' => 456, 'myvar2' => 789), $_GET);
-    }
+        public function testDispatcherWithControllerNotFound()
+        {
+            $this->container['request'] = new Request($this->container, array(
+                    'PHP_SELF' => '/kanboard/index.php',
+                    'REQUEST_URI' => '/kanboard/?controller=FakeControllerNotFound&action=myAction&myvar=value1',
+                    'QUERY_STRING' => 'controller=FakeControllerNotFound&action=myAction&myvar=value1',
+                    'REQUEST_METHOD' => 'GET'
+                ),
+                array(
+                    'controller' => 'FakeControllerNotFound',
+                    'action' => 'myAction',
+                    'myvar' => 'value1',
+                )
+            );
 
-    public function testFindMultipleRoutes()
-    {
-        $r = new Router($this->container);
-        $r->addRoute('a/b', 'controller1', 'action1');
-        $r->addRoute('a/b', 'duplicate', 'duplicate');
-        $r->addRoute('a', 'controller2', 'action2');
-        $this->assertEquals(array('controller1', 'action1'), $r->findRoute('a/b'));
-        $this->assertEquals(array('controller2', 'action2'), $r->findRoute('a'));
-    }
+            $this->setExpectedException('RuntimeException', 'Controller not found');
 
-    public function testFindUrl()
-    {
-        $r = new Router($this->container);
-        $r->addRoute('a/b', 'controller1', 'action1');
-        $r->addRoute('a/:myvar1/b/:myvar2', 'controller2', 'action2', array('myvar1', 'myvar2'));
-
-        $this->assertEquals('a/1/b/2', $r->findUrl('controller2', 'action2', array('myvar1' => 1, 'myvar2' => 2)));
-        $this->assertEquals('', $r->findUrl('controller2', 'action2', array('myvar1' => 1)));
-        $this->assertEquals('a/b', $r->findUrl('controller1', 'action1'));
-        $this->assertEquals('', $r->findUrl('controller1', 'action2'));
+            $dispatcher = new Router($this->container);
+            $dispatcher->dispatch();
+        }
+
+        public function testDispatcherWithActionNotFound()
+        {
+            $this->container['request'] = new Request($this->container, array(
+                    'PHP_SELF' => '/kanboard/index.php',
+                    'REQUEST_URI' => '/kanboard/?controller=FakeController&action=myActionNotFound&myvar=value1',
+                    'QUERY_STRING' => 'controller=FakeController&action=myActionNotFound&myvar=value1',
+                    'REQUEST_METHOD' => 'GET'
+                ),
+                array(
+                    'controller' => 'FakeController',
+                    'action' => 'myActionNotFound',
+                    'myvar' => 'value1',
+                )
+            );
+
+            $this->setExpectedException('RuntimeException', 'Action not implemented');
+
+            $dispatcher = new Router($this->container);
+            $dispatcher->dispatch();
+        }
+
+        public function testDispatcherWithNoUrlRewrite()
+        {
+            $this->container['request'] = new Request($this->container, array(
+                    'PHP_SELF' => '/kanboard/index.php',
+                    'REQUEST_URI' => '/kanboard/?controller=FakeController&action=myAction&myvar=value1',
+                    'QUERY_STRING' => 'controller=FakeController&action=myAction&myvar=value1',
+                    'REQUEST_METHOD' => 'GET'
+                ),
+                array(
+                    'controller' => 'FakeController',
+                    'action' => 'myAction',
+                    'myvar' => 'value1',
+                )
+            );
+
+            $dispatcher = new Router($this->container);
+            $this->assertInstanceOf('\Kanboard\Controller\FakeController', $dispatcher->dispatch());
+            $this->assertEquals('FakeController', $dispatcher->getController());
+            $this->assertEquals('myAction', $dispatcher->getAction());
+            $this->assertEquals('', $dispatcher->getPlugin());
+            $this->assertEquals('value1', $this->container['request']->getStringParam('myvar'));
+        }
+
+        public function testDispatcherWithNoUrlRewriteAndPlugin()
+        {
+            $this->container['request'] = new Request($this->container, array(
+                    'PHP_SELF' => '/kanboard/index.php',
+                    'REQUEST_URI' => '/kanboard/?controller=FakeController&action=myAction&myvar=value1&plugin=myplugin',
+                    'QUERY_STRING' => 'controller=FakeController&action=myAction&myvar=value1&plugin=myplugin',
+                    'REQUEST_METHOD' => 'GET'
+                ),
+                array(
+                    'controller' => 'FakeController',
+                    'action' => 'myAction',
+                    'myvar' => 'value1',
+                    'plugin' => 'myplugin',
+                )
+            );
+
+            $dispatcher = new Router($this->container);
+            $this->assertInstanceOf('\Kanboard\Plugin\Myplugin\Controller\FakeController', $dispatcher->dispatch());
+            $this->assertEquals('FakeController', $dispatcher->getController());
+            $this->assertEquals('myAction', $dispatcher->getAction());
+            $this->assertEquals('Myplugin', $dispatcher->getPlugin());
+            $this->assertEquals('value1', $this->container['request']->getStringParam('myvar'));
+        }
+
+        public function testDispatcherWithUrlRewrite()
+        {
+            $this->container['request'] = new Request($this->container, array(
+                    'PHP_SELF' => '/kanboard/index.php',
+                    'REQUEST_URI' => '/kanboard/my/route/123?myvar=value1',
+                    'QUERY_STRING' => 'myvar=value1',
+                    'REQUEST_METHOD' => 'GET'
+                ),
+                array(
+                    'myvar' => 'value1',
+                )
+            );
+
+            $this->container['route'] = new Route($this->container);
+            $this->container['route']->enable();
+            $dispatcher = new Router($this->container);
+
+            $this->container['route']->addRoute('/my/route/:param', 'FakeController', 'myAction');
+
+            $this->assertInstanceOf('\Kanboard\Controller\FakeController', $dispatcher->dispatch());
+            $this->assertEquals('FakeController', $dispatcher->getController());
+            $this->assertEquals('myAction', $dispatcher->getAction());
+            $this->assertEquals('', $dispatcher->getPlugin());
+            $this->assertEquals('value1', $this->container['request']->getStringParam('myvar'));
+            $this->assertEquals('123', $this->container['request']->getStringParam('param'));
+        }
+
+        public function testDispatcherWithUrlRewriteWithPlugin()
+        {
+            $this->container['request'] = new Request($this->container, array(
+                    'PHP_SELF' => '/kanboard/index.php',
+                    'REQUEST_URI' => '/kanboard/my/plugin/route/123?myvar=value1',
+                    'QUERY_STRING' => 'myvar=value1',
+                    'REQUEST_METHOD' => 'GET'
+                ),
+                array(
+                    'myvar' => 'value1',
+                )
+            );
+
+            $this->container['route'] = new Route($this->container);
+            $this->container['route']->enable();
+            $dispatcher = new Router($this->container);
+
+            $this->container['route']->addRoute('/my/plugin/route/:param', 'fakeController', 'myAction', 'Myplugin');
+
+            $this->assertInstanceOf('\Kanboard\Plugin\Myplugin\Controller\FakeController', $dispatcher->dispatch());
+            $this->assertEquals('FakeController', $dispatcher->getController());
+            $this->assertEquals('myAction', $dispatcher->getAction());
+            $this->assertEquals('Myplugin', $dispatcher->getPlugin());
+            $this->assertEquals('value1', $this->container['request']->getStringParam('myvar'));
+            $this->assertEquals('123', $this->container['request']->getStringParam('param'));
+        }
     }
 }
diff --git a/tests/units/Group/LdapBackendGroupProviderTest.php b/tests/units/Group/LdapBackendGroupProviderTest.php
new file mode 100644
index 00000000..67b5ef35
--- /dev/null
+++ b/tests/units/Group/LdapBackendGroupProviderTest.php
@@ -0,0 +1,16 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Group\LdapBackendGroupProvider;
+
+class LdapBackendGroupProviderTest extends Base
+{
+    public function testGetLdapGroupPattern()
+    {
+        $this->setExpectedException('LogicException', 'LDAP group filter empty, check the parameter LDAP_GROUP_FILTER');
+
+        $backend = new LdapBackendGroupProvider($this->container);
+        $backend->getLdapGroupPattern('test');
+    }
+}
diff --git a/tests/units/Helper/UrlHelperTest.php b/tests/units/Helper/UrlHelperTest.php
index cbacbc73..405e9462 100644
--- a/tests/units/Helper/UrlHelperTest.php
+++ b/tests/units/Helper/UrlHelperTest.php
@@ -4,10 +4,32 @@ require_once __DIR__.'/../Base.php';
 
 use Kanboard\Helper\Url;
 use Kanboard\Model\Config;
+use Kanboard\Core\Http\Request;
 
 class UrlHelperTest extends Base
 {
-    public function testLink()
+    public function testPluginLink()
+    {
+        $h = new Url($this->container);
+        $this->assertEquals(
+            '<a href="?controller=a&amp;action=b&amp;d=e&amp;plugin=something" class="f" title="g" target="_blank">label</a>',
+            $h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true)
+        );
+    }
+
+    public function testPluginLinkWithRouteDefined()
+    {
+        $this->container['route']->enable();
+        $this->container['route']->addRoute('/myplugin/something/:d', 'a', 'b', 'something');
+
+        $h = new Url($this->container);
+        $this->assertEquals(
+            '<a href="myplugin/something/e" class="f" title="g" target="_blank">label</a>',
+            $h->link('label', 'a', 'b', array('d' => 'e', 'plugin' => 'something'), false, 'f', 'g', true)
+        );
+    }
+
+    public function testAppLink()
     {
         $h = new Url($this->container);
         $this->assertEquals(
@@ -36,42 +58,59 @@ class UrlHelperTest extends Base
 
     public function testDir()
     {
-        $h = new Url($this->container);
-        $this->assertEquals('', $h->dir());
+        $this->container['request'] = new Request($this->container, array(
+                'PHP_SELF' => '/kanboard/index.php',
+                'REQUEST_METHOD' => 'GET'
+            )
+        );
 
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        $_SERVER['PHP_SELF'] = '/plop/index.php';
         $h = new Url($this->container);
-        $this->assertEquals('/plop/', $h->dir());
+        $this->assertEquals('/kanboard/', $h->dir());
+
+        $this->container['request'] = new Request($this->container, array(
+                'PHP_SELF' => '/index.php',
+                'REQUEST_METHOD' => 'GET'
+            )
+        );
 
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        $_SERVER['PHP_SELF'] = '';
         $h = new Url($this->container);
         $this->assertEquals('/', $h->dir());
     }
 
     public function testServer()
     {
-        $h = new Url($this->container);
+        $this->container['request'] = new Request($this->container, array(
+                'PHP_SELF' => '/index.php',
+                'REQUEST_METHOD' => 'GET',
+                'SERVER_NAME' => 'localhost',
+                'SERVER_PORT' => 80,
+            )
+        );
 
+        $h = new Url($this->container);
         $this->assertEquals('http://localhost/', $h->server());
 
-        $_SERVER['PHP_SELF'] = '/';
-        $_SERVER['SERVER_NAME'] = 'kb';
-        $_SERVER['SERVER_PORT'] = 1234;
+        $this->container['request'] = new Request($this->container, array(
+                'PHP_SELF' => '/index.php',
+                'REQUEST_METHOD' => 'GET',
+                'SERVER_NAME' => 'kb',
+                'SERVER_PORT' => 1234,
+            )
+        );
 
+        $h = new Url($this->container);
         $this->assertEquals('http://kb:1234/', $h->server());
     }
 
     public function testBase()
     {
-        $h = new Url($this->container);
-
-        $this->assertEquals('http://localhost/', $h->base());
-
-        $_SERVER['PHP_SELF'] = '/';
-        $_SERVER['SERVER_NAME'] = 'kb';
-        $_SERVER['SERVER_PORT'] = 1234;
+        $this->container['request'] = new Request($this->container, array(
+                'PHP_SELF' => '/index.php',
+                'REQUEST_METHOD' => 'GET',
+                'SERVER_NAME' => 'kb',
+                'SERVER_PORT' => 1234,
+            )
+        );
 
         $h = new Url($this->container);
         $this->assertEquals('http://kb:1234/', $h->base());