dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add config for serving main Page from the domain root"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
api
/
ApiQueryWatchlistIntegrationTest.php
diff --git
a/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
b/tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
index
6532635
..
26fedba
100644
(file)
--- a/
tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
+++ b/
tests/phpunit/includes/api/ApiQueryWatchlistIntegrationTest.php
@@
-2,6
+2,7
@@
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
+use MediaWiki\Revision\SlotRecord;
/**
* @group medium
/**
* @group medium
@@
-93,7
+94,7
@@
class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
$page = WikiPage::factory( $title );
$updater = $page->newPageUpdater( $user );
$page = WikiPage::factory( $title );
$updater = $page->newPageUpdater( $user );
- $updater->setContent(
'main'
, ContentHandler::makeContent( $content, $title ) );
+ $updater->setContent(
SlotRecord::MAIN
, ContentHandler::makeContent( $content, $title ) );
$rev = $updater->saveRevision( $summary );
$rc = MediaWikiServices::getInstance()->getRevisionStore()->getRecentChange( $rev );
$rev = $updater->saveRevision( $summary );
$rc = MediaWikiServices::getInstance()->getRevisionStore()->getRecentChange( $rev );
@@
-227,16
+228,8
@@
class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
}
}
}
}
- private function getTitleFormatter() {
- return new MediaWikiTitleCodec(
- Language::factory( 'en' ),
- MediaWikiServices::getInstance()->getGenderCache()
- );
- }
-
private function getPrefixedText( LinkTarget $target ) {
private function getPrefixedText( LinkTarget $target ) {
- $formatter = $this->getTitleFormatter();
- return $formatter->getPrefixedText( $target );
+ return MediaWikiServices::getInstance()->getTitleFormatter()->getPrefixedText( $target );
}
private function cleanTestUsersWatchlist() {
}
private function cleanTestUsersWatchlist() {
@@
-1582,7
+1575,7
@@
class ApiQueryWatchlistIntegrationTest extends ApiTestCase {
$pages = array_values( $result[0]['query']['pages'] );
$this->assertCount( 1, $pages );
$pages = array_values( $result[0]['query']['pages'] );
$this->assertCount( 1, $pages );
- $this->assert
Equals
( 0, $pages[0]['ns'] );
+ $this->assert
Same
( 0, $pages[0]['ns'] );
$this->assertEquals( $this->getPrefixedText( $target ), $pages[0]['title'] );
$this->assertArraySubsetsEqual(
$pages[0]['revisions'],
$this->assertEquals( $this->getPrefixedText( $target ), $pages[0]['title'] );
$this->assertArraySubsetsEqual(
$pages[0]['revisions'],