Change _setHost() on CakeSession to accept parameter to ease testing,…

… add test cases for host setting, and port stripping.
cakephp · Jul 28, 2010 · ca65689 · ca65689
1 parent a63474a
commit ca65689
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/cake/libs/cake_session.php b/cake/libs/cake_session.php
@@ -143,7 +143,7 @@ public static function init($base = null, $start = true) {
 		self::_setupDatabase();
 		if ($start === true) {
 			self::_setPath($base);
-			self::_setHost();
+			self::_setHost(env('HTTP_HOST'));
 			self::start();
 		}
 		if (isset($_SESSION) || $start === true) {
@@ -173,13 +173,13 @@ protected static function _setPath($base = null) {
 	}
 
 /**
- * Set the host
+ * Set the host name
  *
+ * @param string $host Hostname
  * @return void
  */
-	protected static function _setHost() {
-		self::$host = env('HTTP_HOST');
-
+	protected static function _setHost($host) {
+		self::$host = $host;
 		if (strpos(self::$host, ':') !== false) {
 			self::$host = substr(self::$host, 0, strpos(self::$host, ':'));
 		}

diff --git a/cake/tests/cases/libs/cake_session.test.php b/cake/tests/cases/libs/cake_session.test.php
@@ -25,6 +25,10 @@ class TestCakeSession extends CakeSession {
 	public static function setUserAgent($value) {
 		self::$_userAgent = $value;
 	}
+
+	public static function setHost($host) {
+		self::_setHost($host);
+	}
 }
 
 /**
@@ -125,6 +129,30 @@ function testCakeSessionPathContainsQuestion() {
 		$this->assertEqual('/', TestCakeSession::$path);
 	}
 
+/**
+ * testSetHost
+ *
+ * @access public
+ * @return void
+ */
+	function testSetHost() {
+		TestCakeSession::init();
+		TestCakeSession::setHost('cakephp.org');
+		$this->assertEqual('cakephp.org', TestCakeSession::$host);
+	}
+
+/**
+ * testSetHostWithPort
+ *
+ * @access public
+ * @return void
+ */
+	function testSetHostWithPort() {
+		TestCakeSession::init();
+		TestCakeSession::setHost('cakephp.org:443');
+		$this->assertEqual('cakephp.org', TestCakeSession::$host);
+	}
+
 /**
  * testCheck method
  *