Improve settings page and move some config parameters to the database

2 files changed, 12 insertions, 10 deletions

diff --git a/tests/units/BoardTest.php b/tests/units/BoardTest.php
index 21d65543..cdf23a82 100644
--- a/tests/units/BoardTest.php
+++ b/tests/units/BoardTest.php
@@ -27,8 +27,10 @@ class BoardTest extends Base
         $this->assertEquals('Done', $columns[4]);
 
         // Custom columns: spaces should be trimed and no empty columns
+        $input = '   column #1  , column #2, ';
 
-        $this->assertTrue($c->save(array('default_columns' => '   column #1  , column #2, ')));
+        $this->assertTrue($c->save(array('board_columns' => $input)));
+        $this->assertEquals($input, $c->get('board_columns'));
 
         $this->assertEquals(2, $p->create(array('name' => 'UnitTest2')));
         $columns = $b->getColumnsList(2);
diff --git a/tests/units/ConfigTest.php b/tests/units/ConfigTest.php
index 7298936e..4992092b 100644
--- a/tests/units/ConfigTest.php
+++ b/tests/units/ConfigTest.php
@@ -10,14 +10,14 @@ class ConfigTest extends Base
     {
         $c = new Config($this->registry);
 
-        $this->assertEquals('en_US', $c->get('language'));
-        $this->assertEquals('UTC', $c->get('timezone'));
+        $this->assertEquals('en_US', $c->get('application_language'));
+        $this->assertEquals('UTC', $c->get('application_timezone'));
 
-        $this->assertEmpty($c->get('webhooks_url_task_modification'));
-        $this->assertEmpty($c->get('webhooks_url_task_creation'));
-        $this->assertEmpty($c->get('default_columns'));
+        $this->assertEmpty($c->get('webhook_url_task_modification'));
+        $this->assertEmpty($c->get('webhook_url_task_creation'));
+        $this->assertEmpty($c->get('board_columns'));
 
-        $this->assertNotEmpty($c->get('webhooks_token'));
+        $this->assertNotEmpty($c->get('webhook_token'));
         $this->assertNotEmpty($c->get('api_token'));
     }
 
@@ -25,8 +25,8 @@ class ConfigTest extends Base
     {
         $c = new Config($this->registry);
 
-        $this->assertEquals('', $c->get('default_columns'));
-        $this->assertEquals('test', $c->get('default_columns', 'test'));
-        $this->assertEquals(0, $c->get('default_columns', 0));
+        $this->assertEquals('', $c->get('board_columns'));
+        $this->assertEquals('test', $c->get('board_columns', 'test'));
+        $this->assertEquals(0, $c->get('board_columns', 0));
     }
 }