Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315577
Change subject: WIP: first paragraph before the infobox
......................................................................
WIP: first paragraph before the infobox
Added tests.
Bug: T145216
Change-Id: I199685e20bf7ed909c905d08c8ccefcf4aa3e2ab
---
M tests/phpunit/MobileFormatterTest.php
1 file changed, 152 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/77/315577/1
diff --git a/tests/phpunit/MobileFormatterTest.php
b/tests/phpunit/MobileFormatterTest.php
index 976154d..b100b49 100644
--- a/tests/phpunit/MobileFormatterTest.php
+++ b/tests/phpunit/MobileFormatterTest.php
@@ -46,6 +46,9 @@
$mainPage = function( MobileFormatter $f ) {
$f->setIsMainPage( true );
};
+ $moveInfoboxAfterFirstParagraph = function( MobileFormatter $mf
) {
+ $mf->setMoveInfoboxAfterFirstParagraph( true );
+ };
$citeUrl = SpecialPage::getTitleFor( 'MobileCite', '0'
)->getLocalUrl();
$imageStyles = '<img src="math.jpg" style="vertical-align:
-3.505ex; '
@@ -307,6 +310,155 @@
. '<div
id="central-auth-images">images</div></div>',
$mainPage,
],
+
+ // Infobox and the first paragraph in lead section
trasnformations
+ [
+ // hat-note, lead section, no infobox, another
section
+ '<div class="hatnote">hatnote</div>' .
+ '<p>paragraph 1</p><p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<div class="hatnote">hatnote</div>' .
+ '<p>paragraph 1</p><p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+ [
+ // hat-note, lead section, infobox, another
section
+ '<div class="hatnote">hatnote</div>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 1</p><p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<div class="hatnote">hatnote</div>' .
+ '<p>paragraph 1</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+ [
+ // first paragraph is already before the lead
section
+ '<p>paragraph 1</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<p>paragraph 1</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+ [
+ // infobox, but no paragraphs in the lead
section
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+ [
+ // two infoboxes, lead section, another section
+ '<table class="infobox"><tr><td>infobox
1</td></tr></table>' .
+ '<table class="infobox"><tr><td>infobox
2</td></tr></table>' .
+ '<p>paragraph 1</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<p>paragraph 1</p>' .
+ '<table class="infobox"><tr><td>infobox
1</td></tr></table>' .
+ '<table class="infobox"><tr><td>infobox
2</td></tr></table>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+ [
+ // first paragraph (which is coordinates and is
hidden on mobile),
+ // infobox, lead section
+ '<p><span><span
id="coordinates">Coordinates</span></span></p>'.
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 1</p>',
+
+ '<p><span><span
id="coordinates">Coordinates</span></span></p>'.
+ '<p>paragraph 1</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+ [
+ // hatnote, infobox, thumbnail, lead section,
another section
+ '<div class="hatnote">hatnote</div>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<div class="thumb">Thumbnail</div>' .
+ '<p>paragraph 1</p><p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<div class="hatnote">hatnote</div>' .
+ '<p>paragraph 1</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<div class="thumb">Thumbnail</div>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+
+ [
+ // empty first paragraph, infobox, second
paragraph, another section
+ '<p></p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<p></p>' .
+ '<p>paragraph 2</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+
+ [
+ // infobox, empty first paragraph, second
paragraph, another section
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p></p>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<p>paragraph 2</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p></p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
+
+ [
+ // 2 hat-notes, ambox, 2 infoboxes, 2
paragraphs, another section
+ '<div class="hatnote">hatnote</div>' .
+ '<div class="hatnote">hatnote</div>' .
+ '<table
class="ambox"><tr><td>ambox</td></tr></table>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 1</p><p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ '<div class="hatnote">hatnote</div>' .
+ '<div class="hatnote">hatnote</div>' .
+ '<table
class="ambox"><tr><td>ambox</td></tr></table>' .
+ '<p>paragraph 1</p>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<table
class="infobox"><tr><td>infobox</td></tr></table>' .
+ '<p>paragraph 2</p>' .
+ '<h2>Heading 1</h2><p>paragraph 3</p>',
+
+ $moveInfoboxAfterFirstParagraph
+ ],
];
}
--
To view, visit https://gerrit.wikimedia.org/r/315577
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I199685e20bf7ed909c905d08c8ccefcf4aa3e2ab
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Bmansurov <bmansu...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
