diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-11-19 19:50:07 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-11-20 21:12:22 +0100 |
| commit | dd4f2387fd2f4df0e1513c251c9044f5bef60618 (patch) | |
| tree | cddc7f06ac3b2a54d6767e7e84bdd237ae073bf5 | |
| parent | 91daa736639fca67b2d330d0f20aabbd55eec2cf (diff) | |
| download | forums-dd4f2387fd2f4df0e1513c251c9044f5bef60618.tar forums-dd4f2387fd2f4df0e1513c251c9044f5bef60618.tar.gz forums-dd4f2387fd2f4df0e1513c251c9044f5bef60618.tar.bz2 forums-dd4f2387fd2f4df0e1513c251c9044f5bef60618.tar.xz forums-dd4f2387fd2f4df0e1513c251c9044f5bef60618.zip | |
[ticket/12620] Use the test environment for the tests
PHPBB3-12620
| -rw-r--r-- | build/build.xml | 2 | ||||
| -rw-r--r-- | phpBB/config/test/config.yml | 5 | ||||
| -rw-r--r-- | phpBB/config/test/container/environment.yml | 3 | ||||
| -rw-r--r-- | phpBB/config/test/container/parameters.yml | 2 | ||||
| -rw-r--r-- | phpBB/config/test/container/services.yml | 2 | ||||
| -rw-r--r-- | phpBB/config/test/routing.yml | 2 | ||||
| -rw-r--r-- | tests/bootstrap.php | 2 | ||||
| -rw-r--r-- | tests/controller/config/test/routing.yml (renamed from tests/controller/config/development/routing.yml) | 0 | ||||
| -rw-r--r-- | tests/controller/ext/vendor2/bar/config/test/routing.yml (renamed from tests/controller/ext/vendor2/bar/config/development/routing.yml) | 0 | ||||
| -rw-r--r-- | tests/di/create_container_test.php | 2 | ||||
| -rw-r--r-- | tests/di/fixtures/config/test/config.yml (renamed from tests/di/fixtures/config/development/config.yml) | 0 | ||||
| -rw-r--r-- | tests/di/fixtures/config/test/container/environment.yml (renamed from tests/di/fixtures/config/development/container/environment.yml) | 0 | ||||
| -rw-r--r-- | tests/di/fixtures/ext/vendor/disabled/config/test/container/environment.yml (renamed from tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml) | 0 | ||||
| -rw-r--r-- | tests/di/fixtures/ext/vendor/enabled-2/config/test/container/environment.yml (renamed from tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml) | 0 | ||||
| -rw-r--r-- | tests/di/fixtures/other_config/test/config.yml (renamed from tests/di/fixtures/other_config/development/config.yml) | 0 | ||||
| -rw-r--r-- | tests/di/fixtures/other_config/test/container/environment.yml (renamed from tests/di/fixtures/other_config/development/container/environment.yml) | 0 | ||||
| -rw-r--r-- | tests/pagination/config/test/routing.yml (renamed from tests/pagination/config/development/routing.yml) | 0 |
17 files changed, 17 insertions, 3 deletions
diff --git a/build/build.xml b/build/build.xml index 5d143886af..16798f0e97 100644 --- a/build/build.xml +++ b/build/build.xml @@ -283,6 +283,8 @@ <delete file="${dir}/config.php" /> <delete dir="${dir}/develop" /> <delete dir="${dir}/install/data" /> + <delete dir="${dir}/config/development" /> + <delete dir="${dir}/config/test" /> <phingcall target="clean-vendor-dir"> <property name="dir" value="${dir}" /> diff --git a/phpBB/config/test/config.yml b/phpBB/config/test/config.yml new file mode 100644 index 0000000000..1c17b08931 --- /dev/null +++ b/phpBB/config/test/config.yml @@ -0,0 +1,5 @@ +imports: + - { resource: ../default/config.yml } + +core: + require_dev_dependencies: true diff --git a/phpBB/config/test/container/environment.yml b/phpBB/config/test/container/environment.yml new file mode 100644 index 0000000000..40a3c7a683 --- /dev/null +++ b/phpBB/config/test/container/environment.yml @@ -0,0 +1,3 @@ +imports: + - { resource: services.yml } + - { resource: parameters.yml } diff --git a/phpBB/config/test/container/parameters.yml b/phpBB/config/test/container/parameters.yml new file mode 100644 index 0000000000..0447646806 --- /dev/null +++ b/phpBB/config/test/container/parameters.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/parameters.yml } diff --git a/phpBB/config/test/container/services.yml b/phpBB/config/test/container/services.yml new file mode 100644 index 0000000000..b302f0f966 --- /dev/null +++ b/phpBB/config/test/container/services.yml @@ -0,0 +1,2 @@ +imports: + - { resource: ../../default/container/services.yml } diff --git a/phpBB/config/test/routing.yml b/phpBB/config/test/routing.yml new file mode 100644 index 0000000000..9ee3e5ae3a --- /dev/null +++ b/phpBB/config/test/routing.yml @@ -0,0 +1,2 @@ +core.default: + resource: "../default/routing.yml" diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 2fc8858585..ace48ea035 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -12,7 +12,7 @@ */ define('IN_PHPBB', true); -define('PHPBB_ENVIRONMENT', 'development'); +define('PHPBB_ENVIRONMENT', 'test'); $phpbb_root_path = 'phpBB/'; $phpEx = 'php'; diff --git a/tests/controller/config/development/routing.yml b/tests/controller/config/test/routing.yml index 175b11f130..175b11f130 100644 --- a/tests/controller/config/development/routing.yml +++ b/tests/controller/config/test/routing.yml diff --git a/tests/controller/ext/vendor2/bar/config/development/routing.yml b/tests/controller/ext/vendor2/bar/config/test/routing.yml index 85c93b453f..85c93b453f 100644 --- a/tests/controller/ext/vendor2/bar/config/development/routing.yml +++ b/tests/controller/ext/vendor2/bar/config/test/routing.yml diff --git a/tests/di/create_container_test.php b/tests/di/create_container_test.php index 9cc714db40..d52fb6b085 100644 --- a/tests/di/create_container_test.php +++ b/tests/di/create_container_test.php @@ -13,8 +13,6 @@ namespace { - define('PHPBB_ENVIRONMENT', 'production'); - require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php'; require_once dirname(__FILE__) . '/fixtures/ext/vendor/enabled_4/di/extension.php'; diff --git a/tests/di/fixtures/config/development/config.yml b/tests/di/fixtures/config/test/config.yml index fcfa84f68b..fcfa84f68b 100644 --- a/tests/di/fixtures/config/development/config.yml +++ b/tests/di/fixtures/config/test/config.yml diff --git a/tests/di/fixtures/config/development/container/environment.yml b/tests/di/fixtures/config/test/container/environment.yml index f2a22ae109..f2a22ae109 100644 --- a/tests/di/fixtures/config/development/container/environment.yml +++ b/tests/di/fixtures/config/test/container/environment.yml diff --git a/tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml b/tests/di/fixtures/ext/vendor/disabled/config/test/container/environment.yml index 31ada384bf..31ada384bf 100644 --- a/tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml +++ b/tests/di/fixtures/ext/vendor/disabled/config/test/container/environment.yml diff --git a/tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml b/tests/di/fixtures/ext/vendor/enabled-2/config/test/container/environment.yml index feeb5a7a2d..feeb5a7a2d 100644 --- a/tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml +++ b/tests/di/fixtures/ext/vendor/enabled-2/config/test/container/environment.yml diff --git a/tests/di/fixtures/other_config/development/config.yml b/tests/di/fixtures/other_config/test/config.yml index fcfa84f68b..fcfa84f68b 100644 --- a/tests/di/fixtures/other_config/development/config.yml +++ b/tests/di/fixtures/other_config/test/config.yml diff --git a/tests/di/fixtures/other_config/development/container/environment.yml b/tests/di/fixtures/other_config/test/container/environment.yml index c299bfc648..c299bfc648 100644 --- a/tests/di/fixtures/other_config/development/container/environment.yml +++ b/tests/di/fixtures/other_config/test/container/environment.yml diff --git a/tests/pagination/config/development/routing.yml b/tests/pagination/config/test/routing.yml index dd667274cd..dd667274cd 100644 --- a/tests/pagination/config/development/routing.yml +++ b/tests/pagination/config/test/routing.yml |