From dd4f2387fd2f4df0e1513c251c9044f5bef60618 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Wed, 19 Nov 2014 19:50:07 +0100 Subject: [PATCH] [ticket/12620] Use the test environment for the tests PHPBB3-12620 --- build/build.xml | 2 ++ phpBB/config/test/config.yml | 5 +++++ phpBB/config/test/container/environment.yml | 3 +++ phpBB/config/test/container/parameters.yml | 2 ++ phpBB/config/test/container/services.yml | 2 ++ phpBB/config/test/routing.yml | 2 ++ tests/bootstrap.php | 2 +- tests/controller/config/{development => test}/routing.yml | 0 .../ext/vendor2/bar/config/{development => test}/routing.yml | 0 tests/di/create_container_test.php | 2 -- tests/di/fixtures/config/{development => test}/config.yml | 0 .../config/{development => test}/container/environment.yml | 0 .../config/{development => test}/container/environment.yml | 0 .../config/{development => test}/container/environment.yml | 0 .../fixtures/other_config/{development => test}/config.yml | 0 .../{development => test}/container/environment.yml | 0 tests/pagination/config/{development => test}/routing.yml | 0 17 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 phpBB/config/test/config.yml create mode 100644 phpBB/config/test/container/environment.yml create mode 100644 phpBB/config/test/container/parameters.yml create mode 100644 phpBB/config/test/container/services.yml create mode 100644 phpBB/config/test/routing.yml rename tests/controller/config/{development => test}/routing.yml (100%) rename tests/controller/ext/vendor2/bar/config/{development => test}/routing.yml (100%) rename tests/di/fixtures/config/{development => test}/config.yml (100%) rename tests/di/fixtures/config/{development => test}/container/environment.yml (100%) rename tests/di/fixtures/ext/vendor/disabled/config/{development => test}/container/environment.yml (100%) rename tests/di/fixtures/ext/vendor/enabled-2/config/{development => test}/container/environment.yml (100%) rename tests/di/fixtures/other_config/{development => test}/config.yml (100%) rename tests/di/fixtures/other_config/{development => test}/container/environment.yml (100%) rename tests/pagination/config/{development => test}/routing.yml (100%) 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 @@ + + 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 similarity index 100% rename from tests/controller/config/development/routing.yml rename to 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 similarity index 100% rename from tests/controller/ext/vendor2/bar/config/development/routing.yml rename to 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 similarity index 100% rename from tests/di/fixtures/config/development/config.yml rename to 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 similarity index 100% rename from tests/di/fixtures/config/development/container/environment.yml rename to 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 similarity index 100% rename from tests/di/fixtures/ext/vendor/disabled/config/development/container/environment.yml rename to 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 similarity index 100% rename from tests/di/fixtures/ext/vendor/enabled-2/config/development/container/environment.yml rename to 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 similarity index 100% rename from tests/di/fixtures/other_config/development/config.yml rename to 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 similarity index 100% rename from tests/di/fixtures/other_config/development/container/environment.yml rename to 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 similarity index 100% rename from tests/pagination/config/development/routing.yml rename to tests/pagination/config/test/routing.yml