1 files changed, 28 insertions, 2 deletions
diff --git a/tests/units/ConfigTest.php b/tests/units/ConfigTest.php
index 4992092b..b630f284 100644
--- a/tests/units/ConfigTest.php
+++ b/tests/units/ConfigTest.php
@@ -3,12 +3,13 @@
 require_once __DIR__.'/Base.php';
 
 use Model\Config;
+use Core\Session;
 
 class ConfigTest extends Base
 {
     public function testDefaultValues()
     {
-        $c = new Config($this->registry);
+        $c = new Config($this->container);
 
         $this->assertEquals('en_US', $c->get('application_language'));
         $this->assertEquals('UTC', $c->get('application_timezone'));
@@ -23,10 +24,35 @@ class ConfigTest extends Base
 
     public function testGet()
     {
-        $c = new Config($this->registry);
+        $c = new Config($this->container);
 
         $this->assertEquals('', $c->get('board_columns'));
         $this->assertEquals('test', $c->get('board_columns', 'test'));
         $this->assertEquals(0, $c->get('board_columns', 0));
     }
+
+    public function testGetWithSession()
+    {
+        $this->container['session'] = new Session;
+        $c = new Config($this->container);
+
+        session_id('test');
+
+        $this->assertTrue(Session::isOpen());
+
+        $this->assertEquals('', $c->get('board_columns'));
+        $this->assertEquals('test', $c->get('board_columns', 'test'));
+
+        $this->container['session']['config'] = array(
+            'board_columns' => 'foo',
+            'empty_value' => 0
+        );
+
+        $this->assertEquals('foo', $c->get('board_columns'));
+        $this->assertEquals('foo', $c->get('board_columns', 'test'));
+        $this->assertEquals('test', $c->get('empty_value', 'test'));
+
+        session_id('');
+        unset($this->container['session']);
+    }
 }