From 023a1ab36ec0bf3c2fa35f8b6b6e213b556f50a3 Mon Sep 17 00:00:00 2001
From: Arlo Breault
Date: Tue, 3 Jul 2018 15:02:26 -0400
Subject: [PATCH] Sync up with Parsoid parserTests.txt
This now aligns with Parsoid commit bbc56abd8fcc245876fc340723ed3431565b61d1
Change-Id: I463401aa3d2dd290d5ba6813e8e869f713682dd3
---
tests/parser/parserTests.txt | 120 ++++++++++++++++++++++++++++++-----
1 file changed, 104 insertions(+), 16 deletions(-)
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 0fae63acdb..0b12c84a9c 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -2272,6 +2272,83 @@ hi
!! end
+!! test
+Paragraph wrapping following unclosed table
+!! options
+parsoid=wt2html,html2html
+!! wikitext
+{|
+|-
+
+{|
+| x
+|}
+
+a
+
+b
+
+c
+!! html/php+tidy
+
+
+
+
+
+
x
+
+
a
+
b
+
c
+
+!! html/parsoid
+
+
+
+
+
x
+
+
+
a
+
+
b
+
+
c
+!! end
+
+!! test
+Paragraph wrapping suppressed in html p
+!! options
+parsoid=wt2html,html2html
+!! wikitext
+
+
+
+hi
+
+
+
+
+!! html/php+tidy
+
+
+
+hi
+
+
+
+
+!! html/parsoid
+
+
+
+hi
+
+
+
+
+!! end
+
###
### Preformatted text
###
@@ -7240,10 +7317,10 @@ a
a
!! html/parsoid
-
a
-
-
-
+
+a
+
+
!! end
!! test
@@ -12786,16 +12863,22 @@ Templates: Block Tags: 2. Back-to-back template uses
!!end
-# This is an edge case relating to paragraph wrapping.
-!!test
+## This is an edge case relating to paragraph wrapping.
+## Note that Parsoid fails to match Remex because it's using the closing tag
+## as a heuristic to determine if it's in a block, rather than SAX based events.
+!! test
Templates: Correctly encapsulate templates producing
tag without a corresponding
tag
!! wikitext
{{echo|a
b
}}
+!! html/php+tidy
+
a
+
+b
!! html/parsoid
-
a
-b
-!!end
+
a
+b
+!! end
!!test
Templates: Links: 1. Simple example
@@ -13164,13 +13247,13 @@ parsoid=wt2html,wt2wt
foo
!!end
-!!test
+!! test
Templates: Wiki Tables: 1a. Fostering of entire template content
!! wikitext
{|
{{echo|a}}
|}
-!! html
+!! html/php
a
@@ -13180,7 +13263,7 @@ a
a
!! html/parsoid
-
a
+a
!! end
@@ -13216,14 +13299,14 @@ foo
!! end
-!!test
+!! test
Templates: Wiki Tables: 2. Fostering of partial template content
!! wikitext
{|
{{echo|a
b
}}
|}
-!! html
+!! html/php
a
b
@@ -13235,7 +13318,7 @@ a
b
!! html/parsoid
-
a
b
+a
b
@@ -23415,7 +23498,12 @@ Line two
!! end
-# FIXME: Why does/should the blockquote+div combo suppress p-wrapping here?
+## This is a corner case interaction between the paragraph wrapping in the
+## php parser's BlockLevelPass and Remex. `doBlockLevels` has a notion of
+## some tags which close paragraphs (and thus prevent wrapping on their line),
+## of which "div" is one, but do p-wrapping inside them. These are referred
+## to as "never suppressing". Remex, for its part, doesn't traverse into
+## "div"s to p-wrap. Hence, we only get this partial wrapping.
!! test
Paragraphs inside blockquotes/divs (no extra line breaks)
!! wikitext
--
2.20.1