Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 31 insertions, 45 deletions

diff --git a/tests/units/Base.php b/tests/units/Base.php
index 8112c954..eb9fc68b 100644
--- a/tests/units/Base.php
+++ b/tests/units/Base.php
@@ -8,49 +8,9 @@ use Symfony\Component\EventDispatcher\Debug\TraceableEventDispatcher;
 use Symfony\Component\Stopwatch\Stopwatch;
 use SimpleLogger\Logger;
 use SimpleLogger\File;
-
-class FakeHttpClient
-{
-    private $url = '';
-    private $data = array();
-    private $headers = array();
-
-    public function getUrl()
-    {
-        return $this->url;
-    }
-
-    public function getData()
-    {
-        return $this->data;
-    }
-
-    public function getHeaders()
-    {
-        return $this->headers;
-    }
-
-    public function toPrettyJson()
-    {
-        return json_encode($this->data, JSON_PRETTY_PRINT);
-    }
-
-    public function postJson($url, array $data, array $headers = array())
-    {
-        $this->url = $url;
-        $this->data = $data;
-        $this->headers = $headers;
-        return true;
-    }
-
-    public function postForm($url, array $data, array $headers = array())
-    {
-        $this->url = $url;
-        $this->data = $data;
-        $this->headers = $headers;
-        return true;
-    }
-}
+use Kanboard\Core\Session\FlashMessage;
+use Kanboard\Core\Session\SessionStorage;
+use Kanboard\ServiceProvider\ActionProvider;
 
 abstract class Base extends PHPUnit_Framework_TestCase
 {
@@ -73,8 +33,11 @@ abstract class Base extends PHPUnit_Framework_TestCase
         }
 
         $this->container = new Pimple\Container;
+        $this->container->register(new Kanboard\ServiceProvider\AuthenticationProvider);
         $this->container->register(new Kanboard\ServiceProvider\DatabaseProvider);
         $this->container->register(new Kanboard\ServiceProvider\ClassProvider);
+        $this->container->register(new Kanboard\ServiceProvider\NotificationProvider);
+        $this->container->register(new Kanboard\ServiceProvider\RouteProvider);
 
         $this->container['dispatcher'] = new TraceableEventDispatcher(
             new EventDispatcher,
@@ -85,14 +48,37 @@ abstract class Base extends PHPUnit_Framework_TestCase
 
         $this->container['logger'] = new Logger;
         $this->container['logger']->setLogger(new File($this->isWindows() ? 'NUL' : '/dev/null'));
-        $this->container['httpClient'] = new FakeHttpClient;
-        $this->container['emailClient'] = $this->getMockBuilder('EmailClient')->setMethods(array('send'))->getMock();
+
+        $this->container['httpClient'] = $this
+            ->getMockBuilder('\Kanboard\Core\Http\Client')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('get', 'getJson', 'postJson', 'postForm'))
+            ->getMock();
+
+        $this->container['emailClient'] = $this
+            ->getMockBuilder('\Kanboard\Core\Mail\Client')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('send'))
+            ->getMock();
 
         $this->container['userNotificationType'] = $this
             ->getMockBuilder('\Kanboard\Model\UserNotificationType')
             ->setConstructorArgs(array($this->container))
             ->setMethods(array('getType', 'getSelectedTypes'))
             ->getMock();
+
+        $this->container['objectStorage'] = $this
+            ->getMockBuilder('\Kanboard\Core\ObjectStorage\FileStorage')
+            ->setConstructorArgs(array($this->container))
+            ->setMethods(array('put', 'moveFile', 'remove', 'moveUploadedFile'))
+            ->getMock();
+
+        $this->container['sessionStorage'] = new SessionStorage;
+        $this->container->register(new ActionProvider);
+
+        $this->container['flash'] = function ($c) {
+            return new FlashMessage($c);
+        };
     }
 
     public function tearDown()