jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383118 )
Change subject: Remove Main Page as default value and add hint
......................................................................
Remove Main Page as default value and add hint
We don't support to simulate edit conflicts for protected pages, so
removing the default value and placeholder for the Main Page as it is
proteted in most Wikis. Adding a hint that only non-protected pages can be
used.
Bug: T177480
Change-Id: I5f11983f564d875727cfe4769d57e8ee97384b38
---
M i18n/en.json
M includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
M
tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
3 files changed, 1 insertion(+), 4 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index c3c64b3..983b332 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -43,7 +43,7 @@
"twoColConflict-previous-dialog": "Previous",
"twoColConflict-next-dialog": "Next",
"twoColConflict-close-dialog": "Close",
- "twoColConflict-test-title-label": "Enter the title of a wiki page for
which the edit conflict should be simulated:",
+ "twoColConflict-test-title-label": "Enter the title of a non-protected
wiki page for which the edit conflict should be simulated:",
"twoColConflict-test-title-submit": "Show edit page",
"twoColConflict-test-title-not-existing": "There is no page with this
title.",
"twoColConflict-test-text-submit": "Create conflict",
diff --git a/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
b/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
index cb1f46a..8342e36 100644
--- a/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
+++ b/includes/SpecialConflictTestPage/HtmlSpecialTestTitleForm.php
@@ -38,9 +38,7 @@
new TextInputWidget(
[
'name' =>
'mw-twocolconflict-test-title',
- 'value' =>
Title::newMainPage()->getText(),
'classes' => [
'mw-twocolconflict-test-title' ],
- 'placeholder' =>
Title::newMainPage()->getText(),
'suggestions' => false,
'autofocus' => true,
'required' => true,
diff --git
a/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
b/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
index b5370e8..dbe8f35 100644
---
a/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
+++
b/tests/phpunit/SpecialConflictTestPage/SpecialConflictTestPageIntegrationTest.php
@@ -96,7 +96,6 @@
$html,
is( htmlPiece( havingChild(
both( withTagName( 'input' ) )
- ->andAlso( withAttribute( 'placeholder'
)->havingValue( 'Main Page' ) )
->andAlso( withAttribute( 'name'
)->havingValue( 'mw-twocolconflict-test-title' ) )
) ) )
);
--
To view, visit https://gerrit.wikimedia.org/r/383118
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5f11983f564d875727cfe4769d57e8ee97384b38
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: Siebrand <siebr...@kitano.nl>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
