dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "ApiQueryRevisions: Remove bogus query optimization"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
logging
/
MergeLogFormatterTest.php
diff --git
a/tests/phpunit/includes/logging/MergeLogFormatterTest.php
b/tests/phpunit/includes/logging/MergeLogFormatterTest.php
index
5a0b906
..
2ff0ddf
100644
(file)
--- a/
tests/phpunit/includes/logging/MergeLogFormatterTest.php
+++ b/
tests/phpunit/includes/logging/MergeLogFormatterTest.php
@@
-25,9
+25,9
@@
class MergeLogFormatterTest extends LogFormatterTestCase {
array(
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
'api' => array(
array(
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
'api' => array(
- 'mergepoint' => '2014-08-04T16:07:10Z',
'dest_ns' => 0,
'dest_title' => 'NewPage',
'dest_ns' => 0,
'dest_title' => 'NewPage',
+ 'mergepoint' => '2014-08-04T16:07:10Z',
),
),
),
),
),
),
@@
-49,9
+49,9
@@
class MergeLogFormatterTest extends LogFormatterTestCase {
'legacy' => true,
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
'api' => array(
'legacy' => true,
'text' => 'User merged OldPage into NewPage (revisions up to 16:07, 4 August 2014)',
'api' => array(
- 'mergepoint' => '2014-08-04T16:07:10Z',
'dest_ns' => 0,
'dest_title' => 'NewPage',
'dest_ns' => 0,
'dest_title' => 'NewPage',
+ 'mergepoint' => '2014-08-04T16:07:10Z',
),
),
),
),
),
),