Merge "Rename BlockRestriction -> BlockRestrictionStore and wire it up as a service"

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

diff --git a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
index c6b9dee..016a9a0 100644 (file)
--- a/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
+++ b/tests/phpunit/includes/poolcounter/PoolWorkArticleViewTest.php
@@ -1,7 +1,8 @@
 <?php
 use MediaWiki\MediaWikiServices;
-use MediaWiki\Storage\MutableRevisionRecord;
-use MediaWiki\Storage\RevisionRecord;
+use MediaWiki\Revision\MutableRevisionRecord;
+use MediaWiki\Revision\RevisionRecord;
+use MediaWiki\Revision\SlotRecord;
 
 /**
  * @covers PoolWorkArticleView
@@ -13,7 +14,7 @@ class PoolWorkArticleViewTest extends MediaWikiTestCase {
                $user = $this->getTestUser()->getUser();
                $updater = $page->newPageUpdater( $user );
 
-               $updater->setContent( 'main', new WikitextContent( $text ) );
+               $updater->setContent( SlotRecord::MAIN, new WikitextContent( $text ) );
                return $updater->saveRevision( CommentStoreComment::newUnsavedComment( 'testing' ) );
        }
 
@@ -57,7 +58,7 @@ class PoolWorkArticleViewTest extends MediaWikiTestCase {
                $fakeRev = new MutableRevisionRecord( $page->getTitle() );
                $fakeRev->setId( $rev->getId() );
                $fakeRev->setPageId( $page->getId() );
-               $fakeRev->setContent( 'main', new WikitextContent( 'YES!' ) );
+               $fakeRev->setContent( SlotRecord::MAIN, new WikitextContent( 'YES!' ) );
 
                $work = new PoolWorkArticleView( $page, $options, $rev->getId(), false, $fakeRev );
                $work->execute();
@@ -117,6 +118,7 @@ class PoolWorkArticleViewTest extends MediaWikiTestCase {
                        }
                ];
        }
+
        /**
         * @dataProvider provideMagicWords
         */
@@ -157,12 +159,16 @@ class PoolWorkArticleViewTest extends MediaWikiTestCase {
                $fakeRev = new MutableRevisionRecord( $page->getTitle() );
                $fakeRev->setId( $rev1->getId() );
                $fakeRev->setPageId( $page->getId() );
-               $fakeRev->setContent( 'main', new WikitextContent( 'SECRET' ) );
+               $fakeRev->setContent( SlotRecord::MAIN, new WikitextContent( 'SECRET' ) );
                $fakeRev->setVisibility( RevisionRecord::DELETED_TEXT );
 
                $work = new PoolWorkArticleView( $page, $options, $rev1->getId(), false, $fakeRev );
                $this->assertFalse( $work->execute() );
 
+               $work = new PoolWorkArticleView( $page, $options, $rev1->getId(), false, $fakeRev,
+                       RevisionRecord::RAW );
+               $this->assertNotFalse( $work->execute() );
+
                // a deleted current revision should still be show
                $fakeRev->setId( $rev2->getId() );
                $work = new PoolWorkArticleView( $page, $options, $rev2->getId(), false, $fakeRev );