aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid King <imkingdavid@gmail.com>2012-08-21 11:18:53 -0400
committerDavid King <imkingdavid@gmail.com>2012-08-21 11:18:53 -0400
commit008cf967ab176958126582b58941bd7649732315 (patch)
tree15389e5fd2f46a56703152df7c6184e1f6c87436
parentefe9b1010ac7fc38dec0e5182c1902830685f5e3 (diff)
downloadforums-008cf967ab176958126582b58941bd7649732315.tar
forums-008cf967ab176958126582b58941bd7649732315.tar.gz
forums-008cf967ab176958126582b58941bd7649732315.tar.bz2
forums-008cf967ab176958126582b58941bd7649732315.tar.xz
forums-008cf967ab176958126582b58941bd7649732315.zip
[feature/add_events] Re-fix broken test
PHPBB3-9550
-rw-r--r--tests/bootstrap.php1
-rw-r--r--tests/session/append_sid_test.php3
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index 89268ddbab..1017e0c72f 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -22,7 +22,6 @@ $phpbb_class_loader_ext = new phpbb_class_loader('phpbb_ext_', $phpbb_root_path
$phpbb_class_loader_ext->register();
$phpbb_class_loader = new phpbb_class_loader('phpbb_', $phpbb_root_path . 'includes/', ".php");
$phpbb_class_loader->register();
-$phpbb_dispatcher = new phpbb_event_dispatcher();
require_once 'test_framework/phpbb_test_case_helpers.php';
require_once 'test_framework/phpbb_test_case.php';
diff --git a/tests/session/append_sid_test.php b/tests/session/append_sid_test.php
index 88f6f0718e..34f6dea8ca 100644
--- a/tests/session/append_sid_test.php
+++ b/tests/session/append_sid_test.php
@@ -45,6 +45,9 @@ class phpbb_session_append_sid_test extends phpbb_test_case
*/
public function test_append_sid($url, $params, $is_amp, $session_id, $expected, $description)
{
+ global $phpbb_dispatcher;
+
+ $phpbb_dispatcher = new phpbb_mock_event_dispatcher;
$this->assertEquals($expected, append_sid($url, $params, $is_amp, $session_id));
}
}