mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-07 16:15:22 +02:00
Code Issues Releases Wiki Activity

[ticket/10729] Fix handling of third parameter in 3.1

Browse Source 
PHPBB3-10729
This commit is contained in:
Joas Schilling 2014-09-23 09:42:30 +02:00
parent 10b6399d30
commit d6008e896a
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tests/functions_user/delete_user_test.php
View File

@ -106,18 +106,18 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
), ),
), ),
array( array(
'retain', 'Bertie', 'retain', true,
array( array(
array('post_id' => 1, 'poster_id' => ANONYMOUS, 'post_username' => 'Bertie'), array('post_id' => 1, 'poster_id' => ANONYMOUS, 'post_username' => 'Foobar'),
array('post_id' => 2, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'), array('post_id' => 2, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'),
array('post_id' => 3, 'poster_id' => ANONYMOUS, 'post_username' => 'Bertie'), array('post_id' => 3, 'poster_id' => ANONYMOUS, 'post_username' => 'Foobar'),
array('post_id' => 4, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'), array('post_id' => 4, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'),
), ),
array( array(
array( array(
'topic_id' => 1, 'topic_id' => 1,
'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Bertie', 'topic_first_poster_colour' => '', 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Foobar', 'topic_first_poster_colour' => '',
'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Bertie', 'topic_last_poster_colour' => '', 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Foobar', 'topic_last_poster_colour' => '',
), ),
array( array(
'topic_id' => 2, 'topic_id' => 2,
@ -126,8 +126,8 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
), ),
array( array(
'topic_id' => 3, 'topic_id' => 3,
'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Bertie', 'topic_first_poster_colour' => '', 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Foobar', 'topic_first_poster_colour' => '',
'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Bertie', 'topic_last_poster_colour' => '', 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Foobar', 'topic_last_poster_colour' => '',
), ),
array( array(
'topic_id' => 4, 'topic_id' => 4,
@ -136,14 +136,14 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
), ),
), ),
array( array(
array('forum_id' => 1, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Bertie', 'forum_last_poster_colour' => ''), array('forum_id' => 1, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Foobar', 'forum_last_poster_colour' => ''),
array('forum_id' => 2, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Other', 'forum_last_poster_colour' => ''), array('forum_id' => 2, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Other', 'forum_last_poster_colour' => ''),
array('forum_id' => 3, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Bertie', 'forum_last_poster_colour' => ''), array('forum_id' => 3, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Foobar', 'forum_last_poster_colour' => ''),
array('forum_id' => 4, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Other', 'forum_last_poster_colour' => ''), array('forum_id' => 4, 'forum_last_poster_id' => ANONYMOUS, 'forum_last_poster_name' => 'Other', 'forum_last_poster_colour' => ''),
), ),
), ),
array( array(
'remove', 'Bertie', 'remove', true,
array( array(
array('post_id' => 2, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'), array('post_id' => 2, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'),
array('post_id' => 4, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'), array('post_id' => 4, 'poster_id' => ANONYMOUS, 'post_username' => 'Other'),
@ -173,9 +173,9 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
/** /**
* @dataProvider first_last_post_data * @dataProvider first_last_post_data
*/ */
public function test_first_last_post_info($mode, $post_username, $expected_posts, $expected_topics, $expected_forums) public function test_first_last_post_info($mode, $retain_username, $expected_posts, $expected_topics, $expected_forums)
{ {
$this->assertFalse(user_delete($mode, 2, $post_username)); $this->assertFalse(user_delete($mode, 2, $retain_username));
$sql = 'SELECT post_id, poster_id, post_username $sql = 'SELECT post_id, poster_id, post_username
FROM ' . POSTS_TABLE . ' FROM ' . POSTS_TABLE . '

3
tests/functions_user/fixtures/delete_user.xml
View File

@ -360,6 +360,7 @@
</table> </table>
<table name="phpbb_users"> <table name="phpbb_users">
<column>user_id</column> <column>user_id</column>
<column>username</column>
<column>username_clean</column> <column>username_clean</column>
<column>user_permissions</column> <column>user_permissions</column>
<column>user_sig</column> <column>user_sig</column>
@ -367,6 +368,7 @@
<row> <row>
<value>1</value> <value>1</value>
<value>Anonymous</value> <value>Anonymous</value>
<value>anonymous</value>
<value></value> <value></value>
<value></value> <value></value>
<value>2</value> <value>2</value>
@ -374,6 +376,7 @@
<row> <row>
<value>2</value> <value>2</value>
<value>Foobar</value> <value>Foobar</value>
<value>foobar</value>
<value></value> <value></value>
<value></value> <value></value>
<value>2</value> <value>2</value>