aboutsummaryrefslogtreecommitdiffstats
path: root/tests/extension
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-07-08 18:10:01 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-07-08 18:10:01 +0200
commit167c465dd224286e365f04c7738dbfcb78c64e5a (patch)
tree165cb004e6d551886fefdc1c1a14704b353bf94c /tests/extension
parentb3d2898d0103de4d4521a1151731ad8206008a83 (diff)
parent91f5d59f69f6257eed1bb86f43c35d614aa06533 (diff)
downloadforums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar
forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar.gz
forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar.bz2
forums-167c465dd224286e365f04c7738dbfcb78c64e5a.tar.xz
forums-167c465dd224286e365f04c7738dbfcb78c64e5a.zip
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus: [ticket/12787] Updates phpbb_mock_controller_helper [ticket/12787] Add controller_helper::get_current_url() [ticket/12787] Remove one app.php when it's both in $path and $web_root_path [ticket/12787] Fix the absolute board url [ticket/12787] Use a parameter (_referer) instead of the Referer header [ticket/12099] Add unit tests for get_web_root_path_from_ajax_referer() [ticket/12099] Remove config again [ticket/12099] Correctly fix the path when performing AJAX requests [ticket/12099] Add request argument to path_helper service
Diffstat (limited to 'tests/extension')
-rw-r--r--tests/extension/metadata_manager_test.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/extension/metadata_manager_test.php b/tests/extension/metadata_manager_test.php
index 6b6ea80d82..535e4fe0d5 100644
--- a/tests/extension/metadata_manager_test.php
+++ b/tests/extension/metadata_manager_test.php
@@ -53,6 +53,7 @@ class phpbb_extension_metadata_manager_test extends phpbb_database_test_case
new phpbb_mock_request()
),
new \phpbb\filesystem(),
+ $this->getMock('\phpbb\request\request'),
$this->phpbb_root_path,
$this->phpEx
),