diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-12-04 17:20:20 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-12-04 17:20:20 +0100 |
| commit | b474917ba3fbb26e50a7145fa904efec949f20ce (patch) | |
| tree | 4de591fc65811bd1b82c7a5f322c55faf41bd406 /tests/functions_user | |
| parent | fa33abaf0d6cf5c12e5dadeff2c2d59561e19b22 (diff) | |
| parent | 80fa658e8fc94972349b5f0d01f93afba7744e0e (diff) | |
| download | forums-b474917ba3fbb26e50a7145fa904efec949f20ce.tar forums-b474917ba3fbb26e50a7145fa904efec949f20ce.tar.gz forums-b474917ba3fbb26e50a7145fa904efec949f20ce.tar.bz2 forums-b474917ba3fbb26e50a7145fa904efec949f20ce.tar.xz forums-b474917ba3fbb26e50a7145fa904efec949f20ce.zip | |
Merge remote-tracking branch 'Marc/ticket/11842' into develop
* Marc/ticket/11842:
[ticket/11842] Add functional test for creating group
[ticket/11842] Use avatar_data for obtaining driver that should be deleted
[ticket/11842] Use type map for updating avatar types in database
[ticket/11842] Add missing prefix for group id in avatar data
[ticket/11842] Use only new avatar type in user_delete function
[ticket/11842] Add migration file for updating avatar type in database
[ticket/11842] Replace outdated occurences of user and group avatar_type
[ticket/11842] Use group_id 0 and correct avatar name after creating group
Diffstat (limited to 'tests/functions_user')
| -rw-r--r-- | tests/functions_user/group_user_attributes_test.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/functions_user/group_user_attributes_test.php b/tests/functions_user/group_user_attributes_test.php index 4317cf79da..86e4767970 100644 --- a/tests/functions_user/group_user_attributes_test.php +++ b/tests/functions_user/group_user_attributes_test.php @@ -27,7 +27,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes 2, array( 'group_avatar' => '', - 'group_avatar_type' => 0, + 'group_avatar_type' => '', 'group_avatar_height' => 0, 'group_avatar_width' => 0, 'group_rank' => 0, @@ -43,7 +43,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes 2, array( 'group_avatar' => '', - 'group_avatar_type' => 0, + 'group_avatar_type' => '', 'group_avatar_height' => 0, 'group_avatar_width' => 0, 'group_rank' => 0, @@ -59,7 +59,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes 2, array( 'group_avatar' => '', - 'group_avatar_type' => 0, + 'group_avatar_type' => '', 'group_avatar_height' => 0, 'group_avatar_width' => 0, 'group_rank' => 0, @@ -75,7 +75,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes 3, array( 'group_avatar' => 'default2', - 'group_avatar_type' => 1, + 'group_avatar_type' => 'avatar.driver.upload', 'group_avatar_height' => 1, 'group_avatar_width' => 1, 'group_rank' => 3, @@ -91,7 +91,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes 3, array( 'group_avatar' => 'default2', - 'group_avatar_type' => 1, + 'group_avatar_type' => 'avatar.driver.upload', 'group_avatar_height' => 1, 'group_avatar_width' => 1, 'group_rank' => 3, @@ -107,7 +107,7 @@ class phpbb_functions_user_group_user_attributes_test extends phpbb_database_tes 3, array( 'group_avatar' => 'default2', - 'group_avatar_type' => 1, + 'group_avatar_type' => 'avatar.driver.upload', 'group_avatar_height' => 1, 'group_avatar_width' => 1, 'group_rank' => 3, |