diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:19 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:19 +0100 |
| commit | 11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c (patch) | |
| tree | e82645733df4686861c8a9367c3baa79df085c8e /tests/avatar | |
| parent | b340e45907dc4defdbe5dcf2d75f94a6655c180d (diff) | |
| parent | b3d64b3b59234e545a75a6a7bbdda2b77cb5be84 (diff) | |
| download | forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar.gz forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar.bz2 forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.tar.xz forums-11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c.zip | |
Merge pull request #4105 from marc1706/ticket/14387
[ticket/14387] Allow extending avatars by extensions in ACP
Diffstat (limited to 'tests/avatar')
| -rw-r--r-- | tests/avatar/manager_test.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/avatar/manager_test.php b/tests/avatar/manager_test.php index 9b97fa6a68..344eef38ff 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -64,10 +64,13 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case ->method('get_name') ->will($this->returnValue('avatar.driver.foobar')); // barfoo driver can't be mocked with constructor arguments - $this->avatar_barfoo = $this->getMock('\phpbb\avatar\driver\barfoo', array('get_name')); + $this->avatar_barfoo = $this->getMock('\phpbb\avatar\driver\barfoo', array('get_name', 'get_config_name')); $this->avatar_barfoo->expects($this->any()) ->method('get_name') ->will($this->returnValue('avatar.driver.barfoo')); + $this->avatar_barfoo->expects($this->any()) + ->method('get_config_name') + ->will($this->returnValue('barfoo')); $avatar_drivers = array($this->avatar_foobar, $this->avatar_barfoo); foreach ($this->avatar_drivers() as $driver) |