Merge "Remove "only newlines in trailer" special case for category/language links"

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

diff --git a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
index 4070bc0..fd7e0f1 100644 (file)
--- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
+++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
@@ -293,6 +293,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
        }
 
        public function testRcHidepatrolledDisabledFilter() {
+               $this->setMwGlobals( 'wgUseRCPatrol', false );
                $user = $this->getTestUser()->getUser();
                $this->assertConditions(
                        [ # expected
@@ -306,6 +307,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
        }
 
        public function testRcHideunpatrolledDisabledFilter() {
+               $this->setMwGlobals( 'wgUseRCPatrol', false );
                $user = $this->getTestUser()->getUser();
                $this->assertConditions(
                        [ # expected
@@ -474,7 +476,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
                $conds = $this->buildQuery( [ 'userExpLevel' => 'unregistered;experienced' ] );
 
                $this->assertRegExp(
-                       '/\(rc_user = 0\) OR \(\(user_editcount >= 500\) AND \(user_registration <= \'\d+\'\)\)/',
+                       '/\(rc_user = 0\) OR \(\(user_editcount >= 500\) AND \(user_registration <= \'[^\']+\'\)\)/',
                        reset( $conds ),
                        "rc conditions: userExpLevel=unregistered;experienced"
                );