Merge "Use time forcing methods to avoid WANObjectCacheTest flakeiness"

[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..20e69ae 100644 (file)
--- a/tests/phpunit/includes/RevisionDbTestBase.php
+++ b/tests/phpunit/includes/RevisionDbTestBase.php
@@ -1326,6 +1326,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() {