diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-09-23 09:42:30 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-09-23 09:42:30 +0200 |
| commit | d6008e896acde7bec567d3ec1b3d6270918e48f5 (patch) | |
| tree | 6c3e3a5edf2e554a40126359129ffd11f1c1f599 /tests/functions_user | |
| parent | 10b6399d300b05fb0a1f66ccbdb6fc8a2889ebbc (diff) | |
| download | forums-d6008e896acde7bec567d3ec1b3d6270918e48f5.tar forums-d6008e896acde7bec567d3ec1b3d6270918e48f5.tar.gz forums-d6008e896acde7bec567d3ec1b3d6270918e48f5.tar.bz2 forums-d6008e896acde7bec567d3ec1b3d6270918e48f5.tar.xz forums-d6008e896acde7bec567d3ec1b3d6270918e48f5.zip | |
[ticket/10729] Fix handling of third parameter in 3.1
PHPBB3-10729
Diffstat (limited to 'tests/functions_user')
| -rw-r--r-- | tests/functions_user/delete_user_test.php | 24 | ||||
| -rw-r--r-- | tests/functions_user/fixtures/delete_user.xml | 3 |
2 files changed, 15 insertions, 12 deletions
diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php index c728e6c122..399dc6a064 100644 --- a/tests/functions_user/delete_user_test.php +++ b/tests/functions_user/delete_user_test.php @@ -106,18 +106,18 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case ), ), array( - 'retain', 'Bertie', + 'retain', true, 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' => 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( array( 'topic_id' => 1, - 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Bertie', 'topic_first_poster_colour' => '', - 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Bertie', 'topic_last_poster_colour' => '', + 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Foobar', 'topic_first_poster_colour' => '', + 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Foobar', 'topic_last_poster_colour' => '', ), array( 'topic_id' => 2, @@ -126,8 +126,8 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case ), array( 'topic_id' => 3, - 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Bertie', 'topic_first_poster_colour' => '', - 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Bertie', 'topic_last_poster_colour' => '', + 'topic_poster' => ANONYMOUS, 'topic_first_poster_name' => 'Foobar', 'topic_first_poster_colour' => '', + 'topic_last_poster_id' => ANONYMOUS, 'topic_last_poster_name' => 'Foobar', 'topic_last_poster_colour' => '', ), array( 'topic_id' => 4, @@ -136,14 +136,14 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case ), ), 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' => 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( - 'remove', 'Bertie', + 'remove', true, array( array('post_id' => 2, '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 */ - 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 FROM ' . POSTS_TABLE . ' diff --git a/tests/functions_user/fixtures/delete_user.xml b/tests/functions_user/fixtures/delete_user.xml index 6c6d7ea9cc..2e09182780 100644 --- a/tests/functions_user/fixtures/delete_user.xml +++ b/tests/functions_user/fixtures/delete_user.xml @@ -360,6 +360,7 @@ </table> <table name="phpbb_users"> <column>user_id</column> + <column>username</column> <column>username_clean</column> <column>user_permissions</column> <column>user_sig</column> @@ -367,6 +368,7 @@ <row> <value>1</value> <value>Anonymous</value> + <value>anonymous</value> <value></value> <value></value> <value>2</value> @@ -374,6 +376,7 @@ <row> <value>2</value> <value>Foobar</value> + <value>foobar</value> <value></value> <value></value> <value>2</value> |