[Fusionforge-commits] r12262 - branches/Branch_5_1/tests/func/Site

Olivier Berger olberger at libremir.placard.fr.eu.org
Fri Feb 11 10:47:15 CET 2011


Author: olberger
Date: 2011-02-11 10:47:14 +0100 (Fri, 11 Feb 2011)
New Revision: 12262

Modified:
   branches/Branch_5_1/tests/func/Site/loginTest.php
Log:
Fix check on domain name to adjust to http(s) redirects

Modified: branches/Branch_5_1/tests/func/Site/loginTest.php
===================================================================
--- branches/Branch_5_1/tests/func/Site/loginTest.php	2011-02-11 08:38:13 UTC (rev 12261)
+++ branches/Branch_5_1/tests/func/Site/loginTest.php	2011-02-11 09:47:14 UTC (rev 12262)
@@ -59,7 +59,10 @@
 		// used to access it, then logout doesn't work (bug or
 		// feature ?)
 		$location=$this->getLocation();
-		$this->assertStringStartsWith('https://'.HOST.'/', $location, "You may need to set 'HOST' setting in test suite's config file to something compatible with 'web_host' defined in ini file");
+		$url_regexp = str_replace('.', '\.', HOST);
+		$url_regexp = '/https?:\/\/'. $url_regexp .'\//';
+		$this->assertRegExp($url_regexp, $location, 
+				    "You may need to set 'HOST' setting in test suite's config file to something compatible with 'web_host' defined in ini file");
 
 		$this->type("form_loginname", "admin");
 		$this->type("form_pw", "myadmin");




More information about the Fusionforge-commits mailing list