X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fchanges%2FOldChangesListTest.php;h=90c60c826c83abb653e20c6d3c8f7c18121a2aed;hp=5746a61dc4bc983e2f5aac47e792353b02de67a6;hb=956c2430c7b8fceb289aaeacc8d6c2e0def2c56e;hpb=90f599a5a2b46794a3002ee2f2563fc456a2fddb

diff --git a/tests/phpunit/includes/changes/OldChangesListTest.php b/tests/phpunit/includes/changes/OldChangesListTest.php
index 5746a61dc4..90c60c826c 100644
--- a/tests/phpunit/includes/changes/OldChangesListTest.php
+++ b/tests/phpunit/includes/changes/OldChangesListTest.php
@@ -93,7 +93,6 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 			'assert diff link'
 		);
 
-		$this->assertRegExp( '/tabindex="0"/', $line, 'assert tab index' );
 		$this->assertRegExp(
 			'/title=Cat&curid=20131103212153&action=history"/',
 			$line,
@@ -120,15 +119,17 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 		);
 	}
 
-	public function testRecentChangesLine_Tags() {
+	public function testRecentChangesLine_Attribs() {
 		$recentChange = $this->getEditChange();
 		$recentChange->mAttribs['ts_tags'] = 'vandalism,newbie';
 
 		$oldChangesList = $this->getOldChangesList();
 		$line = $oldChangesList->recentChangesLine( $recentChange, false, 1 );
 
-		$this->assertRegExp( '/<li class="[\w\s-]*mw-tag-vandalism[\w\s-]*">/', $line );
-		$this->assertRegExp( '/<li class="[\w\s-]*mw-tag-newbie[\w\s-]*">/', $line );
+		$this->assertRegExp( '/<li data-mw-revid="\d+" data-mw-ts="\d+" class="[\w\s-]*mw-tag-vandalism[\w\s-]*">/',
+			$line );
+		$this->assertRegExp( '/<li data-mw-revid="\d+" data-mw-ts="\d+" class="[\w\s-]*mw-tag-newbie[\w\s-]*">/',
+			$line );
 	}
 
 	public function testRecentChangesLine_numberOfWatchingUsers() {
@@ -151,7 +152,7 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 	}
 
 	private function getNewBotEditChange() {
-		$user = $this->getTestUser();
+		$user = $this->getMutableTestUser()->getUser();
 
 		$recentChange = $this->testRecentChangesHelper->makeNewBotEditRecentChange(
 			$user, 'Abc', '20131103212153', 5, 191, 190, 0, 0
@@ -161,7 +162,7 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 	}
 
 	private function getLogChange( $logType, $logAction ) {
-		$user = $this->getTestUser();
+		$user = $this->getMutableTestUser()->getUser();
 
 		$recentChange = $this->testRecentChangesHelper->makeLogRecentChange(
 			$logType, $logAction, $user, 'Abc', '20131103212153', 0, 0
@@ -171,7 +172,7 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 	}
 
 	private function getEditChange() {
-		$user = $this->getTestUser();
+		$user = $this->getMutableTestUser()->getUser();
 		$recentChange = $this->testRecentChangesHelper->makeEditRecentChange(
 			$user, 'Cat', '20131103212153', 5, 191, 190, 0, 0
 		);
@@ -184,18 +185,8 @@ class OldChangesListTest extends MediaWikiLangTestCase {
 		return new OldChangesList( $context );
 	}
 
-	private function getTestUser() {
-		$user = User::newFromName( 'TestRecentChangesUser' );
-
-		if ( !$user->getId() ) {
-			$user->addToDatabase();
-		}
-
-		return $user;
-	}
-
 	private function getContext() {
-		$user = $this->getTestUser();
+		$user = $this->getMutableTestUser()->getUser();
 		$context = $this->testRecentChangesHelper->getTestContext( $user );
 		$context->setLanguage( 'qqx' );