Merge commit '5d1e7'

1 files changed, 40 insertions, 0 deletions

diff --git a/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
new file mode 100644
index 00000000..74ceff90
--- /dev/null
+++ b/tests/phpunit/includes/api/query/ApiQueryRevisionsTest.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * @group API
+ * @group Database
+ * @group medium
+ * @covers ApiQueryRevisions
+ */
+class ApiQueryRevisionsTest extends ApiTestCase {
+
+	/**
+	 * @group medium
+	 */
+	public function testContentComesWithContentModelAndFormat() {
+		$pageName = 'Help:' . __METHOD__;
+		$title = Title::newFromText( $pageName );
+		$page = WikiPage::factory( $title );
+		$page->doEdit( 'Some text', 'inserting content' );
+
+		$apiResult = $this->doApiRequest( array(
+			'action' => 'query',
+			'prop' => 'revisions',
+			'titles' => $pageName,
+			'rvprop' => 'content',
+		) );
+		$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,
+					'contentformat should be included when asking content so client knows how to interpret it'
+				);
+				$this->assertArrayHasKey( 'contentmodel', $revision,
+					'contentmodel should be included when asking content so client knows how to interpret it'
+				);
+			}
+		}
+	}
+}