summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2016-01-30 07:47:16 -0500
committerFrederic Guillot <fred@kanboard.net>2016-01-30 07:47:16 -0500
commite31dbe18ce4f156c7a0fcb286c60c9b2617c2f47 (patch)
treeb33d4fd5dbce3d88056929825e32767f560cf6c1
parent9b9d823f30f7f7744f412df8ca4c52d7be3c9977 (diff)
Load ActionProvider in unit tests
-rw-r--r--doc/config.markdown28
-rw-r--r--tests/units/Analytic/AverageTimeSpentColumnAnalyticTest.php3
-rw-r--r--tests/units/Base.php6
3 files changed, 5 insertions, 32 deletions
diff --git a/doc/config.markdown b/doc/config.markdown
index 393efbae..92ff2217 100644
--- a/doc/config.markdown
+++ b/doc/config.markdown
@@ -174,34 +174,6 @@ define('LDAP_GROUP_FILTER', '');
define('LDAP_GROUP_ATTRIBUTE_NAME', 'cn');
```
-Google Authentication settings
-------------------------------
-
-```php
-// Enable/disable Google authentication
-define('GOOGLE_AUTH', false);
-
-// Google client id (Get this value from the Google developer console)
-define('GOOGLE_CLIENT_ID', '');
-
-// Google client secret key (Get this value from the Google developer console)
-define('GOOGLE_CLIENT_SECRET', '');
-```
-
-Github Authentication settings
-------------------------------
-
-```php
-// Enable/disable GitHub authentication
-define('GITHUB_AUTH', false);
-
-// GitHub client id (Copy it from your settings -> Applications -> Developer applications)
-define('GITHUB_CLIENT_ID', '');
-
-// GitHub client secret key (Copy it from your settings -> Applications -> Developer applications)
-define('GITHUB_CLIENT_SECRET', '');
-```
-
Reverse-Proxy Authentication settings
-------------------------------------
diff --git a/tests/units/Analytic/AverageTimeSpentColumnAnalyticTest.php b/tests/units/Analytic/AverageTimeSpentColumnAnalyticTest.php
index 75cb181d..8eb370a2 100644
--- a/tests/units/Analytic/AverageTimeSpentColumnAnalyticTest.php
+++ b/tests/units/Analytic/AverageTimeSpentColumnAnalyticTest.php
@@ -16,13 +16,14 @@ class AverageTimeSpentColumnAnalyticTest extends Base
$taskCreationModel = new TaskCreation($this->container);
$projectModel = new Project($this->container);
$averageLeadCycleTimeAnalytic = new AverageTimeSpentColumnAnalytic($this->container);
- $now = time();
$this->assertEquals(1, $projectModel->create(array('name' => 'test1')));
$this->assertEquals(1, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
$this->assertEquals(2, $taskCreationModel->create(array('project_id' => 1, 'title' => 'test')));
+ $now = time();
+
$this->container['db']->table(Task::TABLE)->eq('id', 1)->update(array('date_completed' => $now + 3600));
$this->container['db']->table(Task::TABLE)->eq('id', 2)->update(array('date_completed' => $now + 1800));
diff --git a/tests/units/Base.php b/tests/units/Base.php
index 1eb9a9df..bfcef418 100644
--- a/tests/units/Base.php
+++ b/tests/units/Base.php
@@ -10,7 +10,7 @@ use SimpleLogger\Logger;
use SimpleLogger\File;
use Kanboard\Core\Session\FlashMessage;
use Kanboard\Core\Session\SessionStorage;
-use Kanboard\Core\Action\ActionManager;
+use Kanboard\ServiceProvider\ActionProvider;
class FakeHttpClient
{
@@ -105,9 +105,9 @@ abstract class Base extends PHPUnit_Framework_TestCase
->getMock();
$this->container['sessionStorage'] = new SessionStorage;
- $this->container['actionManager'] = new ActionManager($this->container);
+ $this->container->register(new ActionProvider);
- $this->container['flash'] = function($c) {
+ $this->container['flash'] = function ($c) {
return new FlashMessage($c);
};
}