Merge "RCFilters: Move parameter operations to ViewModel"

[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..5a0834a 100644 (file)
--- a/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
+++ b/tests/phpunit/includes/specialpage/ChangesListSpecialPageTest.php
@@ -15,6 +15,13 @@ use Wikimedia\TestingAccessWrapper;
  * @covers ChangesListSpecialPage
  */
 class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase {
+       public function setUp() {
+               parent::setUp();
+               $this->setMwGlobals( [
+                       'wgStructuredChangeFiltersShowPreference' => true,
+               ] );
+       }
+
        protected function getPage() {
                $mock = $this->getMockBuilder( ChangesListSpecialPage::class )
                        ->setConstructorArgs(
@@ -293,6 +300,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
        }
 
        public function testRcHidepatrolledDisabledFilter() {
+               $this->setMwGlobals( 'wgUseRCPatrol', false );
                $user = $this->getTestUser()->getUser();
                $this->assertConditions(
                        [ # expected
@@ -306,6 +314,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
        }
 
        public function testRcHideunpatrolledDisabledFilter() {
+               $this->setMwGlobals( 'wgUseRCPatrol', false );
                $user = $this->getTestUser()->getUser();
                $this->assertConditions(
                        [ # expected
@@ -474,7 +483,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"
                );
@@ -734,6 +743,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
                                                                'cssClass' => null,
                                                                'conflicts' => [],
                                                                'subset' => [],
+                                                               'defaultHighlightColor' => null
                                                        ],
                                                        [
                                                                'name' => 'hidefoo',
@@ -744,6 +754,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
                                                                'cssClass' => null,
                                                                'conflicts' => [],
                                                                'subset' => [],
+                                                               'defaultHighlightColor' => null
                                                        ],
                                                ],
                                                'fullCoverage' => true,
@@ -765,6 +776,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
                                                                'priority' => -2,
                                                                'conflicts' => [],
                                                                'subset' => [],
+                                                               'defaultHighlightColor' => null
                                                        ],
                                                        [
                                                                'name' => 'garply',
@@ -774,6 +786,7 @@ class ChangesListSpecialPageTest extends AbstractChangesListSpecialPageTestCase
                                                                'priority' => -3,
                                                                'conflicts' => [],
                                                                'subset' => [],
+                                                               'defaultHighlightColor' => null
                                                        ],
                                                ],
                                                'conflicts' => [],