Fixing inherited public properties not being set in SessionHelper.

Adding tests for SessionHelper construction and the setting of inherited properties. Fixes #94
cakephp · Sep 17, 2009 · e0b6b25 · e0b6b25
1 parent 0065005
commit e0b6b25
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/cake/libs/session.php b/cake/libs/session.php
@@ -151,6 +151,8 @@ function __construct($base = null, $start = true) {
 			if (strpos($this->host, ':') !== false) {
 				$this->host = substr($this->host, 0, strpos($this->host, ':'));
 			}
+		}
+		if (isset($_SESSION)) {
 			if (!class_exists('Security')) {
 				App::import('Core', 'Security');
 			}

diff --git a/cake/tests/cases/libs/view/helpers/session.test.php b/cake/tests/cases/libs/view/helpers/session.test.php
@@ -62,9 +62,8 @@ class SessionHelperTest extends CakeTestCase {
  * @access public
  * @return void
  */
-	function setUp() {
+	function startTest() {
 		$this->Session = new SessionHelper();
-		$this->Session->__start();
 
 		$_SESSION = array(
 			'test' => 'info',
@@ -103,6 +102,15 @@ function tearDown() {
 		$_SESSION = array();
 		unset($this->Session);
 	}
+/**
+ * test construction and initial property settings
+ *
+ * @return void
+ **/
+	function testConstruct() {
+		$this->assertFalse(empty($this->Session->sessionTime));
+		$this->assertFalse(empty($this->Session->security));
+	}
 /**
  * testRead method
  *