aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorjaviexin <javiexin@gmail.com>2015-07-23 14:46:51 +0200
committerjaviexin <javiexin@gmail.com>2015-07-23 14:46:51 +0200
commite37b3495f02ecf895f2db1bdf2404f0c2be89073 (patch)
treebf85b2f5433a998864ef67ac3dd3acbc9843a3fe /tests
parent11256cd1679f5764548976455cc89c10d8b1b48f (diff)
downloadforums-e37b3495f02ecf895f2db1bdf2404f0c2be89073.tar
forums-e37b3495f02ecf895f2db1bdf2404f0c2be89073.tar.gz
forums-e37b3495f02ecf895f2db1bdf2404f0c2be89073.tar.bz2
forums-e37b3495f02ecf895f2db1bdf2404f0c2be89073.tar.xz
forums-e37b3495f02ecf895f2db1bdf2404f0c2be89073.zip
[ticket/13981] Add events to capture avatar deletion or overwriting
An event to capture overwriting, and another to capture deletion. Includes better error processing. Replaced global by dependency injection. Fix Travis tests. PHPBB3-13981
Diffstat (limited to 'tests')
-rw-r--r--tests/avatar/manager_test.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php
index a109a7b5de..9b97fa6a68 100644
--- a/tests/avatar/manager_test.php
+++ b/tests/avatar/manager_test.php
@@ -56,6 +56,8 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
);
$guesser = new \phpbb\mimetype\guesser($guessers);
+ $dispatcher = new phpbb_mock_event_dispatcher();
+
// $this->avatar_foobar will be needed later on
$this->avatar_foobar = $this->getMock('\phpbb\avatar\driver\foobar', array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $path_helper, $cache));
$this->avatar_foobar->expects($this->any())
@@ -76,7 +78,7 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
}
else
{
- $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $path_helper, $guesser, $cache));
+ $cur_avatar = $this->getMock('\phpbb\avatar\driver\\' . $driver, array('get_name'), array($this->config, $phpbb_root_path, $phpEx, $path_helper, $guesser, $dispatcher, $cache));
}
$cur_avatar->expects($this->any())
->method('get_name')