diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:23 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-06 13:26:23 +0100 |
| commit | ea6bcdff52fb3f4dc916d39e427643bc00982352 (patch) | |
| tree | 36cbf137435c31bbccad00ceb3ce03f59d553351 /tests/avatar | |
| parent | 82b4eb6d3d9a7747f48ad3d2302d9716c37dac95 (diff) | |
| parent | 11b79fec4d3e48d2446d1c73ed2f8c2b20c1ab5c (diff) | |
| download | forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar.gz forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar.bz2 forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.tar.xz forums-ea6bcdff52fb3f4dc916d39e427643bc00982352.zip | |
Merge branch '3.1.x'
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 9003f72de2..924f1319a2 100644 --- a/tests/avatar/manager_test.php +++ b/tests/avatar/manager_test.php @@ -67,10 +67,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); $files_factory = new \phpbb\files\factory($phpbb_container); |