tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-06-27 06:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Added Makefile so that you can execute 'make test' in sapphire and it will run tests.

Browse Source 
Added support for  array in _ss_environment.php for specifying URLs to use for cli-script.php

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48093 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sam Minnee 2008-01-16 05:24:27 +00:00
parent 1896bff08c
commit ddb96b9dbd
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile Normal file
View File

@ -0,0 +1,6 @@
URL=`./cli-script.php SapphireInfo/baseurl`
test: windmill
windmill:
functest ../cms/tests/test_windmill url=${URL}admin browser=firefox

27
cli-script.php
View File

@ -72,6 +72,24 @@ foreach($envFiles as $envFile) {
}
}
// Find the URL of this script
if(isset($_FILE_TO_URL_MAPPING)) {
$fullPath = $testPath = $_SERVER['SCRIPT_FILENAME'];
while($testPath && $testPath != "/") {
if(isset($_FILE_TO_URL_MAPPING[$testPath])) {
$url = $_FILE_TO_URL_MAPPING[$testPath] . substr($fullPath,strlen($testPath));
$_SERVER['HTTP_HOST'] = parse_url($url, PHP_URL_HOST);
$_SERVER['SCRIPT_NAME'] = parse_url($url, PHP_URL_PATH);
$_SERVER['REQUEST_PORT'] = parse_url($url, PHP_URL_PORT);
break;
}
$testPath = dirname($testPath);
}
}
if(ManifestBuilder::staleManifest()){
ManifestBuilder::compileManifest();
}
@ -80,7 +98,7 @@ require_once(MANIFEST_FILE);
if($_GET['debugmanifest']) Debug::show(file_get_contents(MANIFEST_FILE));
Director::set_environment_type($envType);
if(!isset(Director::$environment_type)) Director::set_environment_type($envType);
// Default director
Director::addRules(10, array(
@ -103,9 +121,14 @@ DB::connect($databaseConfig);
// Get the request URL
// $baseURL = dirname(dirname($_SERVER[SCRIPT_NAME]));
$url = $_GET['url'];
$url = $_SERVER['argv'][1];
if(isset($_SERVER['argv'][2])) {
parse_str($_SERVER['argv'][2], $_GET);
$_REQUEST = $_GET;
print_r($_GET);
}
// Direct away - this is the "main" function, that hands control to the apporopriate controllerx
Director::direct($url);

11
core/control/SapphireInfo.php Normal file
View File

@ -0,0 +1,11 @@
<?php
/**
* Returns information about the current site instance.
*/
class SapphireInfo extends Controller {
function baseurl() {
return Director::absoluteBaseUrl() . "\n";
}
}