Merge "ReverseChronologicalPager: Fix timezone confusion"

[lhc/web/wiklou.git] / tests / phpunit / includes / api / query / ApiQueryRevisionsTest.php

diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
index 74ceff9..1ed5e95 100644 (file)
--- a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
+++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
@@ -15,23 +15,30 @@ class ApiQueryRevisionsTest extends ApiTestCase {
                $pageName = 'Help:' . __METHOD__;
                $title = Title::newFromText( $pageName );
                $page = WikiPage::factory( $title );
-               $page->doEdit( 'Some text', 'inserting content' );
 
-               $apiResult = $this->doApiRequest( array(
+               $page->doEditContent(
+                       ContentHandler::makeContent( 'Some text', $page->getTitle() ),
+                       'inserting content'
+               );
+
+               $apiResult = $this->doApiRequest( [
                        'action' => 'query',
                        'prop' => 'revisions',
                        'titles' => $pageName,
                        'rvprop' => 'content',
-               ) );
+                       'rvslots' => 'main',
+               ] );
                $this->assertArrayHasKey( 'query', $apiResult[0] );
                $this->assertArrayHasKey( 'pages', $apiResult[0]['query'] );
                foreach ( $apiResult[0]['query']['pages'] as $page ) {
                        $this->assertArrayHasKey( 'revisions', $page );
                        foreach ( $page['revisions'] as $revision ) {
-                               $this->assertArrayHasKey( 'contentformat', $revision,
+                               $this->assertArrayHasKey( 'slots', $revision );
+                               $this->assertArrayHasKey( 'main', $revision['slots'] );
+                               $this->assertArrayHasKey( 'contentformat', $revision['slots']['main'],
                                        'contentformat should be included when asking content so client knows how to interpret it'
                                );
-                               $this->assertArrayHasKey( 'contentmodel', $revision,
+                               $this->assertArrayHasKey( 'contentmodel', $revision['slots']['main'],
                                        'contentmodel should be included when asking content so client knows how to interpret it'
                                );
                        }