Revert "[MCR] Turn Revision into a proxy to new code."

[lhc/web/wiklou.git] / tests / phpunit / includes / RevisionDbTestBase.php

diff --git a/tests/phpunit/includes/RevisionDbTestBase.php b/tests/phpunit/includes/RevisionDbTestBase.php
index 2fdf590..91dbf2c 100644 (file)
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -560,7 +560,10 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                $row = $res->fetchObject();
 
                $this->assertEquals( IP::toHex( $ip ), $row->ipc_hex );
-               $this->assertEquals( $orig->getTimestamp(), $row->ipc_rev_timestamp );
+               $this->assertEquals(
+                       $orig->getTimestamp(),
+                       wfTimestamp( TS_MW, $row->ipc_rev_timestamp )
+               );
        }
 
        public static function provideUserWasLastToEdit() {
@@ -1326,6 +1329,16 @@ abstract class RevisionDbTestBase extends MediaWikiTestCase {
                        $expected,
                        Revision::userCanBitfield( $bitField, $field, $user, $title )
                );
+
+               // Fallback to $wgUser
+               $this->setMwGlobals(
+                       'wgUser',
+                       $user
+               );
+               $this->assertSame(
+                       $expected,
+                       Revision::userCanBitfield( $bitField, $field, null, $title )
+               );
        }
 
        public function provideUserCan() {