Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12350] Instantiate Mock Dispatcher for modules_test
This commit is contained in:
Andreas Fischer 2014-04-03 22:20:55 +02:00
commit 22715db92e

View file

@ -209,7 +209,7 @@ class phpbb_extension_modules_test extends phpbb_test_case
*/
public function test_modules_auth($module_auth, $expected)
{
global $phpbb_extension_manager;
global $phpbb_extension_manager, $phpbb_dispatcher;
$phpbb_extension_manager = $this->extension_manager = new phpbb_mock_extension_manager(
dirname(__FILE__) . '/',
@ -227,6 +227,8 @@ class phpbb_extension_modules_test extends phpbb_test_case
)
);
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$this->assertEquals($expected, p_master::module_auth($module_auth, 0));
}
}