From 7cd0fd83b8047f40edfb69a427b14997801ef25b Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Fri, 5 Sep 2014 03:03:20 +0200 Subject: [ticket/12620] Fix tests PHPBB3-12620 --- tests/bootstrap.php | 2 ++ tests/controller/config/production/routing.yml | 3 +++ tests/controller/config/routing.yml | 3 --- tests/pagination/config/production/routing.yml | 6 ++++++ tests/pagination/config/routing.yml | 6 ------ 5 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 tests/controller/config/production/routing.yml delete mode 100644 tests/controller/config/routing.yml create mode 100644 tests/pagination/config/production/routing.yml delete mode 100644 tests/pagination/config/routing.yml (limited to 'tests') diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 0e81f4372a..229a6ee82b 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -12,6 +12,8 @@ */ define('IN_PHPBB', true); +define('PHPBB_ENVIRONMENT', 'production'); + $phpbb_root_path = 'phpBB/'; $phpEx = 'php'; require_once $phpbb_root_path . 'includes/startup.php'; diff --git a/tests/controller/config/production/routing.yml b/tests/controller/config/production/routing.yml new file mode 100644 index 0000000000..175b11f130 --- /dev/null +++ b/tests/controller/config/production/routing.yml @@ -0,0 +1,3 @@ +core_controller: + pattern: /core_foo + defaults: { _controller: core_foo.controller:bar } diff --git a/tests/controller/config/routing.yml b/tests/controller/config/routing.yml deleted file mode 100644 index 175b11f130..0000000000 --- a/tests/controller/config/routing.yml +++ /dev/null @@ -1,3 +0,0 @@ -core_controller: - pattern: /core_foo - defaults: { _controller: core_foo.controller:bar } diff --git a/tests/pagination/config/production/routing.yml b/tests/pagination/config/production/routing.yml new file mode 100644 index 0000000000..dd667274cd --- /dev/null +++ b/tests/pagination/config/production/routing.yml @@ -0,0 +1,6 @@ +core_controller: + pattern: /test + defaults: { _controller: core_foo.controller:bar, page: 1} +core_page_controller: + pattern: /test/page/{page} + defaults: { _controller: core_foo.controller:bar} diff --git a/tests/pagination/config/routing.yml b/tests/pagination/config/routing.yml deleted file mode 100644 index dd667274cd..0000000000 --- a/tests/pagination/config/routing.yml +++ /dev/null @@ -1,6 +0,0 @@ -core_controller: - pattern: /test - defaults: { _controller: core_foo.controller:bar, page: 1} -core_page_controller: - pattern: /test/page/{page} - defaults: { _controller: core_foo.controller:bar} -- cgit v1.2.1