tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2143 from creative-commoners/pulls/4.2/bootstrapp 

FIX Fixture the 'app' dir instead of mysite in unit tests
This commit is contained in:
Damian Mooyman 2018-04-12 11:35:00 +12:00 committed by GitHub
parent c4f8af543c 5da708d223
commit 09a3c9a05b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/behat/serve-bootstrap.php
View File

@ -3,4 +3,4 @@
require __DIR__ . '/../bootstrap/init.php';
require FRAMEWORK_PATH . '/tests/bootstrap/init.php';
require FRAMEWORK_PATH . '/tests/bootstrap/environment.php';
require __DIR__ . '/../bootstrap/mysite.php';
require __DIR__ . '/../bootstrap/app.php';

2
tests/bootstrap.php
View File

@ -4,4 +4,4 @@ require __DIR__ . '/bootstrap/init.php';
require FRAMEWORK_PATH . '/tests/bootstrap/init.php';
require FRAMEWORK_PATH . '/tests/bootstrap/cli.php';
require FRAMEWORK_PATH . '/tests/bootstrap/environment.php';
require __DIR__ . '/bootstrap/mysite.php';
require __DIR__ . '/bootstrap/app.php';

6
tests/bootstrap/mysite.php → tests/bootstrap/app.php
View File

@ -1,10 +1,10 @@
<?php
// Mock mysite if not installed with silverstripe/installer
// Mock app if not installed with silverstripe/installer
if (defined('BASE_PATH')) {
$projectPath = BASE_PATH . '/mysite';
$projectPath = BASE_PATH . '/app';
} else {
$projectPath = getcwd() . '/mysite';
$projectPath = getcwd() . '/app';
}
if (!is_dir($projectPath)) {
mkdir($projectPath, 02775);