From e0188f70c56e1ab50a13d00c339328eff2f17c0d Mon Sep 17 00:00:00 2001 From: Taylor Otwell Date: Wed, 18 Jan 2012 14:27:01 -0600 Subject: [PATCH] added bundles and storage directory to dummy laravel test setup. --- paths.php | 7 +++++-- phpunit.php | 13 +++++++++++-- tests/laravel/{ => application}/bundle.php | 0 tests/laravel/{ => application}/config/.gitignore | 0 .../{ => application}/config/application.php | 0 tests/laravel/{ => application}/config/auth.php | 0 tests/laravel/{ => application}/config/cache.php | 0 tests/laravel/{ => application}/config/database.php | 0 tests/laravel/{ => application}/config/error.php | 0 tests/laravel/{ => application}/config/mimes.php | 0 tests/laravel/{ => application}/config/session.php | 0 tests/laravel/{ => application}/config/strings.php | 0 .../laravel/{ => application}/controllers/home.php | 0 .../{ => application}/dashboard/repository.php | 0 .../{ => application}/language/en/pagination.php | 0 .../{ => application}/language/en/validation.php | 0 .../laravel/{ => application}/libraries/.gitignore | 0 .../laravel/{ => application}/migrations/.gitignore | 0 tests/laravel/{ => application}/models/.gitignore | 0 .../laravel/{ => application}/models/autoloader.php | 0 .../{ => application}/models/repositories/user.php | 0 tests/laravel/{ => application}/models/user.php | 0 tests/laravel/{ => application}/routes.php | 0 tests/laravel/{ => application}/tasks/.gitignore | 0 tests/laravel/{ => application}/views/error/404.php | 0 tests/laravel/{ => application}/views/error/500.php | 0 .../laravel/{ => application}/views/home/index.php | 0 tests/laravel/bundles/.gitignore | 0 tests/laravel/storage/cache/.gitignore | 0 tests/laravel/storage/database/.gitignore | 1 + tests/laravel/storage/logs/.gitignore | 0 tests/laravel/storage/sessions/.gitignore | 0 tests/laravel/storage/views/.gitignore | 0 33 files changed, 17 insertions(+), 4 deletions(-) rename tests/laravel/{ => application}/bundle.php (100%) rename tests/laravel/{ => application}/config/.gitignore (100%) rename tests/laravel/{ => application}/config/application.php (100%) rename tests/laravel/{ => application}/config/auth.php (100%) rename tests/laravel/{ => application}/config/cache.php (100%) rename tests/laravel/{ => application}/config/database.php (100%) rename tests/laravel/{ => application}/config/error.php (100%) rename tests/laravel/{ => application}/config/mimes.php (100%) rename tests/laravel/{ => application}/config/session.php (100%) rename tests/laravel/{ => application}/config/strings.php (100%) rename tests/laravel/{ => application}/controllers/home.php (100%) rename tests/laravel/{ => application}/dashboard/repository.php (100%) rename tests/laravel/{ => application}/language/en/pagination.php (100%) rename tests/laravel/{ => application}/language/en/validation.php (100%) rename tests/laravel/{ => application}/libraries/.gitignore (100%) rename tests/laravel/{ => application}/migrations/.gitignore (100%) rename tests/laravel/{ => application}/models/.gitignore (100%) rename tests/laravel/{ => application}/models/autoloader.php (100%) rename tests/laravel/{ => application}/models/repositories/user.php (100%) rename tests/laravel/{ => application}/models/user.php (100%) rename tests/laravel/{ => application}/routes.php (100%) rename tests/laravel/{ => application}/tasks/.gitignore (100%) rename tests/laravel/{ => application}/views/error/404.php (100%) rename tests/laravel/{ => application}/views/error/500.php (100%) rename tests/laravel/{ => application}/views/home/index.php (100%) create mode 100644 tests/laravel/bundles/.gitignore create mode 100644 tests/laravel/storage/cache/.gitignore create mode 100644 tests/laravel/storage/database/.gitignore create mode 100644 tests/laravel/storage/logs/.gitignore create mode 100644 tests/laravel/storage/sessions/.gitignore create mode 100644 tests/laravel/storage/views/.gitignore diff --git a/paths.php b/paths.php index 3421f83a..d21cc45e 100644 --- a/paths.php +++ b/paths.php @@ -16,7 +16,10 @@ // -------------------------------------------------------------- // 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. @@ -67,7 +70,7 @@ { if ( ! defined($name)) { - $path = ($web) ? '../'.$path : $path; + if ($web) $path = "../{$path}"; define($name, realpath($path).DS); } diff --git a/phpunit.php b/phpunit.php index 412d1748..8cbb50b0 100644 --- a/phpunit.php +++ b/phpunit.php @@ -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) { 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); } } diff --git a/tests/laravel/bundle.php b/tests/laravel/application/bundle.php similarity index 100% rename from tests/laravel/bundle.php rename to tests/laravel/application/bundle.php diff --git a/tests/laravel/config/.gitignore b/tests/laravel/application/config/.gitignore similarity index 100% rename from tests/laravel/config/.gitignore rename to tests/laravel/application/config/.gitignore diff --git a/tests/laravel/config/application.php b/tests/laravel/application/config/application.php similarity index 100% rename from tests/laravel/config/application.php rename to tests/laravel/application/config/application.php diff --git a/tests/laravel/config/auth.php b/tests/laravel/application/config/auth.php similarity index 100% rename from tests/laravel/config/auth.php rename to tests/laravel/application/config/auth.php diff --git a/tests/laravel/config/cache.php b/tests/laravel/application/config/cache.php similarity index 100% rename from tests/laravel/config/cache.php rename to tests/laravel/application/config/cache.php diff --git a/tests/laravel/config/database.php b/tests/laravel/application/config/database.php similarity index 100% rename from tests/laravel/config/database.php rename to tests/laravel/application/config/database.php diff --git a/tests/laravel/config/error.php b/tests/laravel/application/config/error.php similarity index 100% rename from tests/laravel/config/error.php rename to tests/laravel/application/config/error.php diff --git a/tests/laravel/config/mimes.php b/tests/laravel/application/config/mimes.php similarity index 100% rename from tests/laravel/config/mimes.php rename to tests/laravel/application/config/mimes.php diff --git a/tests/laravel/config/session.php b/tests/laravel/application/config/session.php similarity index 100% rename from tests/laravel/config/session.php rename to tests/laravel/application/config/session.php diff --git a/tests/laravel/config/strings.php b/tests/laravel/application/config/strings.php similarity index 100% rename from tests/laravel/config/strings.php rename to tests/laravel/application/config/strings.php diff --git a/tests/laravel/controllers/home.php b/tests/laravel/application/controllers/home.php similarity index 100% rename from tests/laravel/controllers/home.php rename to tests/laravel/application/controllers/home.php diff --git a/tests/laravel/dashboard/repository.php b/tests/laravel/application/dashboard/repository.php similarity index 100% rename from tests/laravel/dashboard/repository.php rename to tests/laravel/application/dashboard/repository.php diff --git a/tests/laravel/language/en/pagination.php b/tests/laravel/application/language/en/pagination.php similarity index 100% rename from tests/laravel/language/en/pagination.php rename to tests/laravel/application/language/en/pagination.php diff --git a/tests/laravel/language/en/validation.php b/tests/laravel/application/language/en/validation.php similarity index 100% rename from tests/laravel/language/en/validation.php rename to tests/laravel/application/language/en/validation.php diff --git a/tests/laravel/libraries/.gitignore b/tests/laravel/application/libraries/.gitignore similarity index 100% rename from tests/laravel/libraries/.gitignore rename to tests/laravel/application/libraries/.gitignore diff --git a/tests/laravel/migrations/.gitignore b/tests/laravel/application/migrations/.gitignore similarity index 100% rename from tests/laravel/migrations/.gitignore rename to tests/laravel/application/migrations/.gitignore diff --git a/tests/laravel/models/.gitignore b/tests/laravel/application/models/.gitignore similarity index 100% rename from tests/laravel/models/.gitignore rename to tests/laravel/application/models/.gitignore diff --git a/tests/laravel/models/autoloader.php b/tests/laravel/application/models/autoloader.php similarity index 100% rename from tests/laravel/models/autoloader.php rename to tests/laravel/application/models/autoloader.php diff --git a/tests/laravel/models/repositories/user.php b/tests/laravel/application/models/repositories/user.php similarity index 100% rename from tests/laravel/models/repositories/user.php rename to tests/laravel/application/models/repositories/user.php diff --git a/tests/laravel/models/user.php b/tests/laravel/application/models/user.php similarity index 100% rename from tests/laravel/models/user.php rename to tests/laravel/application/models/user.php diff --git a/tests/laravel/routes.php b/tests/laravel/application/routes.php similarity index 100% rename from tests/laravel/routes.php rename to tests/laravel/application/routes.php diff --git a/tests/laravel/tasks/.gitignore b/tests/laravel/application/tasks/.gitignore similarity index 100% rename from tests/laravel/tasks/.gitignore rename to tests/laravel/application/tasks/.gitignore diff --git a/tests/laravel/views/error/404.php b/tests/laravel/application/views/error/404.php similarity index 100% rename from tests/laravel/views/error/404.php rename to tests/laravel/application/views/error/404.php diff --git a/tests/laravel/views/error/500.php b/tests/laravel/application/views/error/500.php similarity index 100% rename from tests/laravel/views/error/500.php rename to tests/laravel/application/views/error/500.php diff --git a/tests/laravel/views/home/index.php b/tests/laravel/application/views/home/index.php similarity index 100% rename from tests/laravel/views/home/index.php rename to tests/laravel/application/views/home/index.php diff --git a/tests/laravel/bundles/.gitignore b/tests/laravel/bundles/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/tests/laravel/storage/cache/.gitignore b/tests/laravel/storage/cache/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/tests/laravel/storage/database/.gitignore b/tests/laravel/storage/database/.gitignore new file mode 100644 index 00000000..6a91a439 --- /dev/null +++ b/tests/laravel/storage/database/.gitignore @@ -0,0 +1 @@ +*.sqlite \ No newline at end of file diff --git a/tests/laravel/storage/logs/.gitignore b/tests/laravel/storage/logs/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/tests/laravel/storage/sessions/.gitignore b/tests/laravel/storage/sessions/.gitignore new file mode 100644 index 00000000..e69de29b diff --git a/tests/laravel/storage/views/.gitignore b/tests/laravel/storage/views/.gitignore new file mode 100644 index 00000000..e69de29b