jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/333815 )
Change subject: Remove unnecessary nowikis ...................................................................... Remove unnecessary nowikis * Besides, the comment says the html is supposed to match the previous test. Change-Id: I2dfa02d826574d12831fa773748264c01766c6a7 --- M tests/parserTests.txt 1 file changed, 10 insertions(+), 18 deletions(-) Approvals: Subramanya Sastry: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/parserTests.txt b/tests/parserTests.txt index 6f66257..7d99c89 100644 --- a/tests/parserTests.txt +++ b/tests/parserTests.txt @@ -933,6 +933,7 @@ ### ### multiple quote sequences in a line ### + !! test Italics and bold: multiple quote sequences: (2,4,2) !! options @@ -942,8 +943,7 @@ !! html/* <p><i>foo'<b>bar</b></i> </p> -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -955,7 +955,6 @@ </p> !! end - !! test Italics and bold: multiple quote sequences: (2,4,3) !! options @@ -965,8 +964,7 @@ !! html/* <p><i>foo'<b>bar</b></i> </p> -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -978,7 +976,6 @@ </p> !! end - !! test Italics and bold: multiple quote sequences: (2,4,4) !! options @@ -988,8 +985,7 @@ !! html/* <p><i>foo'<b>bar'</b></i> </p> -!!end - +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test @@ -1000,7 +996,6 @@ <p><i>foo'<b>bar'</b></i> </p> !! end - # The PHP parser strips the empty tags out for giggles; parsoid doesn't. !! test @@ -1015,23 +1010,20 @@ !! html/parsoid <p><b>foo'</b>bar<i></i> </p> -!!end +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test Italics and bold: multiple quote sequences: (3,4,2+2) w/ nowiki -!! options -parsoid !! wikitext -'''<nowiki>foo'</nowiki>'''bar''<nowiki/>'' +'''foo''''bar''<nowiki/>'' !! html/php <p><b>foo'</b>bar </p> !! html/parsoid -<p><b><span typeof="mw:Nowiki">foo'</span></b>bar<i></i> +<p><b>foo'</b>bar<i></i> </p> !! end - # The PHP parser strips the empty tags out for giggles; parsoid doesn't. !! test @@ -1046,18 +1038,18 @@ !! html/parsoid <p><b>foo'</b>bar<b></b> </p> -!!end +!! end # same html as previous, but wikitext adjusted to match parsoid html2wt !! test Italics and bold: multiple quote sequences: (3,4,3+3) w/ nowiki !! wikitext -'''<nowiki>foo'</nowiki>'''bar'''<nowiki/>''' +'''foo''''bar'''<nowiki/>''' !! html/php <p><b>foo'</b>bar </p> !! html/parsoid -<p><b><span typeof="mw:Nowiki">foo'</span></b>bar<b></b> +<p><b>foo'</b>bar<b></b> </p> !! end -- To view, visit https://gerrit.wikimedia.org/r/333815 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2dfa02d826574d12831fa773748264c01766c6a7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra <abrea...@wikimedia.org> Gerrit-Reviewer: C. Scott Ananian <canan...@wikimedia.org> Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits