X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fpage%2FWikiPageDbTestBase.php;h=6367a0f8ef7c388b3342d9ff2dc59e8b5d1d0dd3;hp=6b680e56d60da4428a0577239f2cb98edbcbfe53;hb=326d655fc9309f55112538b387ed8c201158a27d;hpb=68923d7a2385b4822bfc9f14f83567c2efacabd2

diff --git a/tests/phpunit/includes/page/WikiPageDbTestBase.php b/tests/phpunit/includes/page/WikiPageDbTestBase.php
index 6b680e56d6..6367a0f8ef 100644
--- a/tests/phpunit/includes/page/WikiPageDbTestBase.php
+++ b/tests/phpunit/includes/page/WikiPageDbTestBase.php
@@ -374,20 +374,6 @@ abstract class WikiPageDbTestBase extends MediaWikiLangTestCase {
 				true
 			],
 
-			// comma
-			[ 'WikiPageTest_testIsCountable',
-				CONTENT_MODEL_WIKITEXT,
-				'Foo',
-				'comma',
-				false
-			],
-			[ 'WikiPageTest_testIsCountable',
-				CONTENT_MODEL_WIKITEXT,
-				'Foo, bar',
-				'comma',
-				true
-			],
-
 			// link
 			[ 'WikiPageTest_testIsCountable',
 				CONTENT_MODEL_WIKITEXT,
@@ -409,12 +395,6 @@ abstract class WikiPageDbTestBase extends MediaWikiLangTestCase {
 				'any',
 				false
 			],
-			[ 'WikiPageTest_testIsCountable',
-				CONTENT_MODEL_WIKITEXT,
-				'#REDIRECT [[bar]]',
-				'comma',
-				false
-			],
 			[ 'WikiPageTest_testIsCountable',
 				CONTENT_MODEL_WIKITEXT,
 				'#REDIRECT [[bar]]',
@@ -429,12 +409,6 @@ abstract class WikiPageDbTestBase extends MediaWikiLangTestCase {
 				'any',
 				false
 			],
-			[ 'Talk:WikiPageTest_testIsCountable',
-				CONTENT_MODEL_WIKITEXT,
-				'Foo, bar',
-				'comma',
-				false
-			],
 			[ 'Talk:WikiPageTest_testIsCountable',
 				CONTENT_MODEL_WIKITEXT,
 				'Foo [[bar]]',
@@ -449,12 +423,6 @@ abstract class WikiPageDbTestBase extends MediaWikiLangTestCase {
 				'any',
 				false
 			],
-			[ 'MediaWiki:WikiPageTest_testIsCountable.js',
-				null,
-				'Foo, bar',
-				'comma',
-				false
-			],
 			[ 'MediaWiki:WikiPageTest_testIsCountable.js',
 				null,
 				'Foo [[bar]]',
@@ -1784,12 +1752,13 @@ more stuff
 
 		// Make sure the log entry looks good
 		// log_params is not checked here
+		$actorQuery = ActorMigration::newMigration()->getJoin( 'log_user' );
 		$this->assertSelect(
-			'logging',
+			[ 'logging' ] + $actorQuery['tables'],
 			[
 				'log_comment',
-				'log_user',
-				'log_user_text',
+				'log_user' => $actorQuery['fields']['log_user'],
+				'log_user_text' => $actorQuery['fields']['log_user_text'],
 				'log_namespace',
 				'log_title',
 			],
@@ -1800,7 +1769,9 @@ more stuff
 				$user->getName(),
 				(string)$page->getTitle()->getNamespace(),
 				$page->getTitle()->getDBkey(),
-			] ]
+			] ],
+			[],
+			$actorQuery['joins']
 		);
 	}