Fix bug in case REQUEST_URI does not contain the tests path

Refs #3722
matomo-org · Feb 7, 2013 · 477c338 · 477c338
1 parent f26d1d1
commit 477c338
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/tests/PHPUnit/IntegrationTestCase.php b/tests/PHPUnit/IntegrationTestCase.php
@@ -565,7 +565,10 @@ public static function getRootUrl()
 			$pathBeforeRoot = 'plugins';
 		}
 
-		$piwikUrl = substr($piwikUrl, 0, strpos($piwikUrl, $pathBeforeRoot.'/'));
+		$testsInPath =  strpos($piwikUrl, $pathBeforeRoot.'/');
+		if($testsInPath  !== false) {
+			$piwikUrl = substr($piwikUrl, 0, $testsInPath);
+		}
 		return $piwikUrl;
 	}
 

diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
@@ -64,7 +64,9 @@ function checkPiwikSetupForTests()
 	$expectedString = 'plugins/CoreHome/templates/images/favicon.ico';
 
 	if(strpos($fetched, $expectedString) === false) {
-		echo "\nPiwik should be running at: " . $piwikServerUrl . "\nbut this URL returned an unexpected response: '". $fetched . "'\n\n";
+		echo "\nPiwik should be running at: " . $piwikServerUrl
+			. "\nbut this URL returned an unexpected response: '"
+			. substr($fetched,0,300) . "...'\n\n";
 		exit;
 	}
 }