X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fapi%2FApiEditPageTest.php;h=aeb829dd621b51fa559729dddf798a303883a7fc;hb=37f10242d25cd3214ae73ca47fe799cc5bdf8e20;hp=2161093311ccc95621af837bc123977ea31ddbd2;hpb=1d5344025f02e1b2b9646c6d88083255edd87f58;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php index 2161093311..aeb829dd62 100644 --- a/tests/phpunit/includes/api/ApiEditPageTest.php +++ b/tests/phpunit/includes/api/ApiEditPageTest.php @@ -152,7 +152,7 @@ class ApiEditPageTest extends ApiTestCase { $content = $page->getContent(); $this->assertNotNull( $content, 'Page should have been created' ); - $text = $content->getNativeData(); + $text = $content->getText(); $this->assertSame( $expected, $text ); } @@ -176,7 +176,7 @@ class ApiEditPageTest extends ApiTestCase { $this->assertSame( 'Success', $re['edit']['result'] ); $newtext = WikiPage::factory( Title::newFromText( $name ) ) ->getContent( Revision::RAW ) - ->getNativeData(); + ->getText(); $this->assertSame( "==section 1==\nnew content 1\n\n==section 2==\ncontent2", $newtext ); // Test that we raise a 'nosuchsection' error @@ -216,7 +216,7 @@ class ApiEditPageTest extends ApiTestCase { // Check the page text is correct $text = WikiPage::factory( Title::newFromText( $name ) ) ->getContent( Revision::RAW ) - ->getNativeData(); + ->getText(); $this->assertSame( "== header ==\n\ntest", $text ); // Now on one that does @@ -232,7 +232,7 @@ class ApiEditPageTest extends ApiTestCase { $this->assertSame( 'Success', $re2['edit']['result'] ); $text = WikiPage::factory( Title::newFromText( $name ) ) ->getContent( Revision::RAW ) - ->getNativeData(); + ->getText(); $this->assertSame( "== header ==\n\ntest\n\n== header ==\n\ntest", $text ); } @@ -733,7 +733,7 @@ class ApiEditPageTest extends ApiTestCase { 'undoafter' => $revId1, ] ); - $text = ( new WikiPage( $titleObj ) )->getContent()->getNativeData(); + $text = ( new WikiPage( $titleObj ) )->getContent()->getText(); // This is wrong! It should be 1. But let's test for our incorrect // behavior for now, so if someone fixes it they'll fix the test as @@ -761,7 +761,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) )->getContent() - ->getNativeData(); + ->getText(); $this->assertSame( '3', $text ); } @@ -784,7 +784,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) )->getContent() - ->getNativeData(); + ->getText(); $this->assertSame( '1', $text ); } @@ -855,7 +855,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( 'Alert: Some text', $text ); } @@ -872,7 +872,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( 'Some text is nice', $text ); } @@ -890,7 +890,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( 'Alert: Some text is nice', $text ); } @@ -957,7 +957,7 @@ class ApiEditPageTest extends ApiTestCase { } finally { // Validate that content was not changed $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( 'Some text', $text ); } @@ -1059,7 +1059,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( "Initial content\n\n== New section ==", $text ); } @@ -1097,7 +1097,7 @@ class ApiEditPageTest extends ApiTestCase { $page = new WikiPage( Title::newFromText( $name ) ); $this->assertSame( "Initial content\n\n== My section ==\n\nMore content", - $page->getContent()->getNativeData() ); + $page->getContent()->getText() ); $this->assertSame( '/* My section */ new section', $page->getRevision()->getComment() ); } @@ -1118,7 +1118,7 @@ class ApiEditPageTest extends ApiTestCase { $page = new WikiPage( Title::newFromText( $name ) ); $this->assertSame( "Initial content\n\n== Add new section ==\n\nMore content", - $page->getContent()->getNativeData() ); + $page->getContent()->getText() ); // EditPage actually assumes the summary is the section name here $this->assertSame( '/* Add new section */ new section', $page->getRevision()->getComment() ); @@ -1141,7 +1141,7 @@ class ApiEditPageTest extends ApiTestCase { $page = new WikiPage( Title::newFromText( $name ) ); $this->assertSame( "Initial content\n\n== My section ==\n\nMore content", - $page->getContent()->getNativeData() ); + $page->getContent()->getText() ); $this->assertSame( 'Add new section', $page->getRevision()->getComment() ); } @@ -1160,7 +1160,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( "== Section 1 ==\n\nContent and more content\n\n" . "== Section 2 ==\n\nFascinating!", $text ); @@ -1179,7 +1179,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( "Content and more content\n\n== Section 1 ==\n\n" . "Fascinating!", $text ); @@ -1201,7 +1201,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); } finally { $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( 'Content', $text ); } @@ -1223,7 +1223,7 @@ class ApiEditPageTest extends ApiTestCase { ] ); } finally { $text = ( new WikiPage( Title::newFromText( $name ) ) ) - ->getContent()->getNativeData(); + ->getContent()->getText(); $this->assertSame( 'Content', $text ); } @@ -1349,7 +1349,7 @@ class ApiEditPageTest extends ApiTestCase { 'ctd_name', [ 'ct_rev_id' => $revId ], __METHOD__, - [ 'change_tag_def' => [ 'INNER JOIN', 'ctd_id = ct_tag_id' ] ] + [ 'change_tag_def' => [ 'JOIN', 'ctd_id = ct_tag_id' ] ] ) ); } @@ -1474,8 +1474,7 @@ class ApiEditPageTest extends ApiTestCase { public function testEditWhileBlocked() { $name = 'Help:' . ucfirst( __FUNCTION__ ); - $this->setExpectedException( ApiUsageException::class, - 'You have been blocked from editing.' ); + $this->assertNull( Block::newFromTarget( '127.0.0.1' ), 'Sanity check' ); $block = new Block( [ 'address' => self::$users['sysop']->getUser()->getName(), @@ -1483,6 +1482,7 @@ class ApiEditPageTest extends ApiTestCase { 'reason' => 'Capriciousness', 'timestamp' => '19370101000000', 'expiry' => 'infinity', + 'enableAutoblock' => true, ] ); $block->insert(); @@ -1492,6 +1492,10 @@ class ApiEditPageTest extends ApiTestCase { 'title' => $name, 'text' => 'Some text', ] ); + $this->fail( 'Expected exception not thrown' ); + } catch ( ApiUsageException $ex ) { + $this->assertSame( 'You have been blocked from editing.', $ex->getMessage() ); + $this->assertNotNull( Block::newFromTarget( '127.0.0.1' ), 'Autoblock spread' ); } finally { $block->delete(); self::$users['sysop']->getUser()->clearInstanceCache();