jenkins-bot has submitted this change and it was merged. Change subject: Sync up with Parsoid parserTests. ......................................................................
Sync up with Parsoid parserTests. This now aligns with Parsoid commit dd8e644d320aec076f76da4e2bd70a8527e0dfd8 Change-Id: Id41989ae0973804c51ed10353d0ac81cef5a6211 --- M tests/parser/parserTests.txt 1 file changed, 23 insertions(+), 22 deletions(-) Approvals: Cscott: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt index be9ccaf..f45c666 100644 --- a/tests/parser/parserTests.txt +++ b/tests/parser/parserTests.txt @@ -6572,13 +6572,15 @@ !! test Table with row followed by newlines and table heading +!! options +parsoid=wt2html,html2html !! wikitext {| |- ! foo |} -!! html +!! html/* <table> @@ -6590,13 +6592,15 @@ !! test Table with empty line following the start tag +!! options +parsoid=wt2html,html2html !! wikitext {| |- | foo |} -!! html +!! html/* <table> @@ -7082,8 +7086,9 @@ </tbody></table> !! end +# T137406: Whitespace in the HTML !! test -Strip unsupported table tags, but introduce row wikitext as required +1. Generate correct wikitext for tables with thead/tbody/tfoot !! options parsoid=html2wt !! html/parsoid @@ -7115,22 +7120,17 @@ !! wikitext {| |+Test - !Month !Savings - |- |January |$100 - |- |February |$80 - |- |Sum |$180 - |} !! html/php+tidy <table> @@ -7152,6 +7152,21 @@ <td>$180</td> </tr> </table> +!! end + +# T137406: No whitespace in the HTML +!! test +2. Generate correct wikitext for tables with thead/tbody/tfoot +!! options +parsoid=html2wt +!! html/parsoid +<table><thead><tr><th>heading</th></tr></thead><tbody><tr><td>foo</td></tr></tbody></table> +!! wikitext +{| +!heading +|- +|foo +|} !! end !! test @@ -8335,8 +8350,6 @@ !! test Interlanguage link -!! options -parsoid=wt2html,wt2wt,html2html !! wikitext Blah blah blah [[zh:Chinese]] @@ -8365,8 +8378,6 @@ !! test Double interlanguage link -!! options -parsoid=wt2html,wt2wt,html2html !! wikitext Blah blah blah [[es:Spanish]] @@ -23165,14 +23176,12 @@ parsoid=html2wt !! html/* <table> - <tr> <td>foo!!bar </td></tr></table> !! wikitext {| - |foo!!bar |} !! end @@ -23183,14 +23192,12 @@ parsoid=html2wt !! html/* <table> - <tr> <th>foo!bar </th></tr></table> !! wikitext {| - !foo!bar |} !! end @@ -23257,7 +23264,6 @@ parsoid=html2wt !! html/* <table> - <tr> <th>-bar </th></tr> @@ -23267,9 +23273,7 @@ !! wikitext {| - !-bar - |- |<nowiki>-bar</nowiki> |} @@ -23281,7 +23285,6 @@ parsoid=html2wt !! html/* <table> - <tr> <th>+bar </th></tr> @@ -23291,9 +23294,7 @@ !! wikitext {| - !+bar - |- |<nowiki>+bar</nowiki> |} -- To view, visit https://gerrit.wikimedia.org/r/296842 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id41989ae0973804c51ed10353d0ac81cef5a6211 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry <ssas...@wikimedia.org> Gerrit-Reviewer: Arlolra <abrea...@wikimedia.org> Gerrit-Reviewer: Cscott <canan...@wikimedia.org> Gerrit-Reviewer: Jackmcbarn <jackmcb...@gmail.com> Gerrit-Reviewer: Legoktm <legoktm.wikipe...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits