diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2014-05-01 21:49:18 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2014-05-01 21:49:18 -0500 |
| commit | 4f236729e4c8fe94c0ace3b0b84f45653019e224 (patch) | |
| tree | bd9853ab29ed9a4f697826baab27f2e5f78710f6 /tests | |
| parent | 5c54cd6a45a130eb389edff946d413bc17aeecbe (diff) | |
| parent | 7b8a8a2a5da212657e1baf02466665c9e4a9ec8a (diff) | |
| download | forums-4f236729e4c8fe94c0ace3b0b84f45653019e224.tar forums-4f236729e4c8fe94c0ace3b0b84f45653019e224.tar.gz forums-4f236729e4c8fe94c0ace3b0b84f45653019e224.tar.bz2 forums-4f236729e4c8fe94c0ace3b0b84f45653019e224.tar.xz forums-4f236729e4c8fe94c0ace3b0b84f45653019e224.zip | |
Merge remote-tracking branch 'remotes/Nicofuma/ticket/12444' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12444:
[ticket/12444] Replacing spaces with tabs
[ticket/12444] Replace spaces with tabs
[ticket/12444] Adding regression test
[ticket/12444] The logs message aren't filled correctly
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/log/fixtures/full_log.xml | 12 | ||||
| -rw-r--r-- | tests/log/function_view_log_test.php | 27 |
2 files changed, 39 insertions, 0 deletions
diff --git a/tests/log/fixtures/full_log.xml b/tests/log/fixtures/full_log.xml index 4e5538d5a9..ef35884444 100644 --- a/tests/log/fixtures/full_log.xml +++ b/tests/log/fixtures/full_log.xml @@ -131,6 +131,18 @@ <value>LOG_SINGULAR_PLURAL</value> <value>a:1:{i:0;i:2;}</value> </row> + <row> + <value>11</value> + <value>1</value> + <value>1</value> + <value>15</value> + <value>3</value> + <value>0</value> + <value>127.0.0.1</value> + <value>1</value> + <value>LOG_MOD3</value> + <value>a:1:{i:0;s:5:"guest";}</value> + </row> </table> <table name="phpbb_users"> <column>user_id</column> diff --git a/tests/log/function_view_log_test.php b/tests/log/function_view_log_test.php index 2f64459062..542d0adf9d 100644 --- a/tests/log/function_view_log_test.php +++ b/tests/log/function_view_log_test.php @@ -225,6 +225,27 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'viewforum' => '', 'action' => 'LOG_SINGULAR_PLURAL 2', ), + 11 => array( + 'id' => 11, + + 'reportee_id' => 0, + 'reportee_username' => '', + 'reportee_username_full'=> '', + + 'user_id' => 1, + 'username' => 'Anonymous', + 'username_full' => 'Anonymous', + + 'ip' => '127.0.0.1', + 'time' => 1, + 'forum_id' => 15, + 'topic_id' => 3, + + 'viewforum' => '', + 'action' => 'LOG_MOD3 guest ', + 'viewtopic' => '', + 'viewlogs' => '', + ), ); $test_cases = array( @@ -310,6 +331,11 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'expected_returned' => 0, 'user', false, 5, 0, 0, 0, 0, 0, 'l.log_id ASC', 'plural', ), + array( + 'expected' => array(11), + 'expected_returned' => 0, + 'mod', 0, 5, 0, 15, 3, + ), ); foreach ($test_cases as $case => $case_data) @@ -362,6 +388,7 @@ class phpbb_log_function_view_log_test extends phpbb_database_test_case 'LOG_INSTALL_INSTALLED' => 'installed: %s', 'LOG_USER' => 'User<br /> %s', 'LOG_MOD2' => 'Mod2', + 'LOG_MOD3' => 'Mod3: %1$s, %2$s', 'LOG_SINGULAR_PLURAL' => array( 1 => 'singular', 2 => 'plural (%d)', |