X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiEditPageTest.php;h=02d0a0dc57af7c67d57810731a3e23eeb1d5151e;hb=6b3e5511fb848890f174690885e748b90389c0b8;hp=7a8e208b0c0096246b4f2a831e5815d444279780;hpb=d716155c8b2d6e4a51a4110195cee7a1794846e8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index 7a8e208b0c..7eac55975a 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -36,14 +36,18 @@ class ApiEditPageTest extends ApiTestCase {
 		$wgContentHandlers["testing"] = 'DummyContentHandlerForTesting';
 		$wgContentHandlers["testing-nontext"] = 'DummyNonTextContentHandler';
 
-		MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
+		MWNamespace::clearCaches();
 		$wgContLang->resetNamespaces(); # reset namespace cache
 
 		$this->doLogin();
 	}
 
 	protected function tearDown() {
-		MWNamespace::getCanonicalNamespaces( true ); # reset namespace cache
+		global $wgContLang;
+
+		MWNamespace::clearCaches();
+		$wgContLang->resetNamespaces(); # reset namespace cache
+
 		parent::tearDown();
 	}
 
@@ -195,16 +199,16 @@ class ApiEditPageTest extends ApiTestCase {
 				'section' => '9999',
 				'text' => 'text',
 			] );
-			$this->fail( "Should have raised a UsageException" );
-		} catch ( UsageException $e ) {
-			$this->assertEquals( 'nosuchsection', $e->getCodeString() );
+			$this->fail( "Should have raised an ApiUsageException" );
+		} catch ( ApiUsageException $e ) {
+			$this->assertTrue( self::apiExceptionHasCode( $e, 'nosuchsection' ) );
 		}
 	}
 
 	/**
 	 * Test action=edit&section=new
 	 * Run it twice so we test adding a new section on a
-	 * page that doesn't exist (bug 52830) and one that
+	 * page that doesn't exist (T54830) and one that
 	 * does exist
 	 */
 	public function testEditNewSection() {
@@ -333,8 +337,8 @@ class ApiEditPageTest extends ApiTestCase {
 			], null, self::$users['sysop']->getUser() );
 
 			$this->fail( 'redirect-appendonly error expected' );
-		} catch ( UsageException $ex ) {
-			$this->assertEquals( 'redirect-appendonly', $ex->getCodeString() );
+		} catch ( ApiUsageException $ex ) {
+			$this->assertTrue( self::apiExceptionHasCode( $ex, 'redirect-appendonly' ) );
 		}
 	}
 
@@ -369,8 +373,8 @@ class ApiEditPageTest extends ApiTestCase {
 			], null, self::$users['sysop']->getUser() );
 
 			$this->fail( 'edit conflict expected' );
-		} catch ( UsageException $ex ) {
-			$this->assertEquals( 'editconflict', $ex->getCodeString() );
+		} catch ( ApiUsageException $ex ) {
+			$this->assertTrue( self::apiExceptionHasCode( $ex, 'editconflict' ) );
 		}
 	}
 
@@ -416,7 +420,7 @@ class ApiEditPageTest extends ApiTestCase {
 		$count++;
 
 		/*
-		* bug 41990: if the target page has a newer revision than the redirect, then editing the
+		* T43990: if the target page has a newer revision than the redirect, then editing the
 		* redirect while specifying 'redirect' and *not* specifying 'basetimestamp' erroneously
 		* caused an edit conflict to be detected.
 		*/
@@ -474,7 +478,7 @@ class ApiEditPageTest extends ApiTestCase {
 
 	public function testCheckDirectApiEditingDisallowed_forNonTextContent() {
 		$this->setExpectedException(
-			'UsageException',
+			ApiUsageException::class,
 			'Direct editing via API is not supported for content model ' .
 				'testing used by Dummy:ApiEditPageTest_nonTextPageEdit'
 		);
@@ -513,4 +517,57 @@ class ApiEditPageTest extends ApiTestCase {
 		$this->assertEquals( "testing-nontext", $page->getContentModel() );
 		$this->assertEquals( $data, $page->getContent()->serialize() );
 	}
+
+	/**
+	 * This test verifies that after changing the content model
+	 * of a page, undoing that edit via the API will also
+	 * undo the content model change.
+	 */
+	public function testUndoAfterContentModelChange() {
+		$name = 'Help:' . __FUNCTION__;
+		$uploader = self::$users['uploader']->getUser();
+		$sysop = self::$users['sysop']->getUser();
+		$apiResult = $this->doApiRequestWithToken( [
+			'action' => 'edit',
+			'title' => $name,
+			'text' => 'some text',
+		], null, $sysop )[0];
+
+		// Check success
+		$this->assertArrayHasKey( 'edit', $apiResult );
+		$this->assertArrayHasKey( 'result', $apiResult['edit'] );
+		$this->assertEquals( 'Success', $apiResult['edit']['result'] );
+		$this->assertArrayHasKey( 'contentmodel', $apiResult['edit'] );
+		// Content model is wikitext
+		$this->assertEquals( 'wikitext', $apiResult['edit']['contentmodel'] );
+
+		// Convert the page to JSON
+		$apiResult = $this->doApiRequestWithToken( [
+			'action' => 'edit',
+			'title' => $name,
+			'text' => '{}',
+			'contentmodel' => 'json',
+		], null, $uploader )[0];
+
+		// Check success
+		$this->assertArrayHasKey( 'edit', $apiResult );
+		$this->assertArrayHasKey( 'result', $apiResult['edit'] );
+		$this->assertEquals( 'Success', $apiResult['edit']['result'] );
+		$this->assertArrayHasKey( 'contentmodel', $apiResult['edit'] );
+		$this->assertEquals( 'json', $apiResult['edit']['contentmodel'] );
+
+		$apiResult = $this->doApiRequestWithToken( [
+			'action' => 'edit',
+			'title' => $name,
+			'undo' => $apiResult['edit']['newrevid']
+		], null, $sysop )[0];
+
+		// Check success
+		$this->assertArrayHasKey( 'edit', $apiResult );
+		$this->assertArrayHasKey( 'result', $apiResult['edit'] );
+		$this->assertEquals( 'Success', $apiResult['edit']['result'] );
+		$this->assertArrayHasKey( 'contentmodel', $apiResult['edit'] );
+		// Check that the contentmodel is back to wikitext now.
+		$this->assertEquals( 'wikitext', $apiResult['edit']['contentmodel'] );
+	}
 }