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 /tests/di | |
| parent | [ticket/12620] Fix session tests (diff) | |
| download | phpbb-dd4f2387fd2f4df0e1513c251c9044f5bef60618.tar.gz phpbb-dd4f2387fd2f4df0e1513c251c9044f5bef60618.tar.bz2 phpbb-dd4f2387fd2f4df0e1513c251c9044f5bef60618.zip | |
[ticket/12620] Use the test environment for the tests
PHPBB3-12620
Diffstat (limited to 'tests/di')
| -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 |
7 files changed, 0 insertions, 2 deletions
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 |