Commit e0188f70 authored by Taylor Otwell's avatar Taylor Otwell

added bundles and storage directory to dummy laravel test setup.

parent 813cd0d3
...@@ -16,7 +16,10 @@ if ( ! isset($web)) $web = false; ...@@ -16,7 +16,10 @@ if ( ! isset($web)) $web = false;
// -------------------------------------------------------------- // --------------------------------------------------------------
// Define the directory separator for the environment. // Define the directory separator for the environment.
// -------------------------------------------------------------- // --------------------------------------------------------------
define('DS', DIRECTORY_SEPARATOR); if ( ! defined('DS'))
{
define('DS', DIRECTORY_SEPARATOR);
}
// -------------------------------------------------------------- // --------------------------------------------------------------
// Define the path to the base directory. // Define the path to the base directory.
...@@ -67,7 +70,7 @@ foreach ($paths as $name => $path) ...@@ -67,7 +70,7 @@ foreach ($paths as $name => $path)
{ {
if ( ! defined($name)) if ( ! defined($name))
{ {
$path = ($web) ? '../'.$path : $path; if ($web) $path = "../{$path}";
define($name, realpath($path).DS); define($name, realpath($path).DS);
} }
......
...@@ -9,13 +9,22 @@ ...@@ -9,13 +9,22 @@
*/ */
// -------------------------------------------------------------- // --------------------------------------------------------------
// Override the application path if testing Laravel. // Define the directory separator for the environment.
// --------------------------------------------------------------
define('DS', DIRECTORY_SEPARATOR);
// --------------------------------------------------------------
// Override the framework paths if testing Laravel.
// -------------------------------------------------------------- // --------------------------------------------------------------
foreach ($_SERVER['argv'] as $key => $argument) foreach ($_SERVER['argv'] as $key => $argument)
{ {
if ($argument == 'laravel' and $_SERVER['argv'][$key - 1] == '--group') if ($argument == 'laravel' and $_SERVER['argv'][$key - 1] == '--group')
{ {
define('APP_PATH', realpath('tests/laravel').DIRECTORY_SEPARATOR); define('APP_PATH', realpath('tests/laravel/application').DS);
define('BUNDLE_PATH', realpath('tests/laravel/bundles').DS);
define('STORAGE_PATH', realpath('tests/laravel/storage').DS);
} }
} }
......
*.sqlite
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment