diff options
| author | Pppery <mapreader@olum.org> | 2023-10-20 21:37:41 -0400 |
|---|---|---|
| committer | Dreamy Jazz <dreamyjazzwikipedia@gmail.com> | 2024-01-05 23:09:15 +0000 |
| commit | 876e9883aaab9c21d5ff68177f1bcc2a399b831b (patch) | |
| tree | 71788e15784483871d5e49e49201060cf3417516 /tests/phpunit/includes/logging/MergeLogFormatterTest.php | |
| parent | 1121ea90d0abd9d7ea52040a2fbd985a61847f60 (diff) | |
| download | mediawikicore-876e9883aaab9c21d5ff68177f1bcc2a399b831b.tar.gz mediawikicore-876e9883aaab9c21d5ff68177f1bcc2a399b831b.zip | |
Allow MergeHistory to split up joined revisions with same timestamp
Bug: T183501
Change-Id: Iedd818a83838683fb07334aade11754557828062
Diffstat (limited to 'tests/phpunit/includes/logging/MergeLogFormatterTest.php')
| -rw-r--r-- | tests/phpunit/includes/logging/MergeLogFormatterTest.php | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/tests/phpunit/includes/logging/MergeLogFormatterTest.php b/tests/phpunit/includes/logging/MergeLogFormatterTest.php index 1978f1b52daf..45b3f72d9120 100644 --- a/tests/phpunit/includes/logging/MergeLogFormatterTest.php +++ b/tests/phpunit/includes/logging/MergeLogFormatterTest.php @@ -12,7 +12,31 @@ class MergeLogFormatterTest extends LogFormatterTestCase { */ public static function provideMergeLogDatabaseRows() { return [ - // Current format + // Current format with a revid + [ + [ + 'type' => 'merge', + 'action' => 'merge', + 'comment' => 'Merge comment', + 'namespace' => NS_MAIN, + 'title' => 'OldPage', + 'params' => [ + '4::dest' => 'NewPage', + '5::mergepoint' => '20140804160710', + '6::mergerevid' => '1234' + ], + ], + [ + 'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)', + 'api' => [ + 'mergerevid' => '1234', + 'dest_ns' => 0, + 'dest_title' => 'NewPage', + 'mergepoint' => '2014-08-04T16:07:10Z', + ], + ], + ], + // Same format without a revid [ [ 'type' => 'merge', |