Merge "Avoid arithmetics on localized number string ("0,04") in SpecialWatchlist"

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

diff --git a/tests/phpunit/includes/PageArchiveTest.php b/tests/phpunit/includes/PageArchiveTest.php
index 7fdc3ed..15a991e 100644 (file)
--- a/tests/phpunit/includes/PageArchiveTest.php
+++ b/tests/phpunit/includes/PageArchiveTest.php
@@ -52,6 +52,7 @@ class PageArchiveTest extends MediaWikiTestCase {
 
                $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
                $this->setMwGlobals( 'wgActorTableSchemaMigrationStage', MIGRATION_OLD );
+               $this->setMwGlobals( 'wgMultiContentRevisionSchemaMigrationStage', SCHEMA_COMPAT_OLD );
                $this->overrideMwServices();
 
                // First create our dummy page
@@ -135,6 +136,7 @@ class PageArchiveTest extends MediaWikiTestCase {
         */
        public function testListRevisions() {
                $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD );
+               $this->setMwGlobals( 'wgMultiContentRevisionSchemaMigrationStage', SCHEMA_COMPAT_OLD );
                $this->overrideMwServices();
 
                $revisions = $this->archivedPage->listRevisions();
@@ -169,7 +171,6 @@ class PageArchiveTest extends MediaWikiTestCase {
                                'ar_id' => '2',
                                'ar_namespace' => '0',
                                'ar_title' => 'PageArchiveTest_thePage',
-                               'ar_text' => '',
                                'ar_text_id' => '3',
                                'ar_parent_id' => '2',
                        ],
@@ -195,7 +196,6 @@ class PageArchiveTest extends MediaWikiTestCase {
                                'ar_id' => '1',
                                'ar_namespace' => '0',
                                'ar_title' => 'PageArchiveTest_thePage',
-                               'ar_text' => '',
                                'ar_text_id' => '2',
                                'ar_parent_id' => '0',
                        ],