From: Mark Holmquist
Date: Fri, 3 May 2013 00:32:38 +0000 (-0700)
Subject: Add attributes to the Parsoid-only tests.
X-Git-Tag: 1.31.0-rc.0~19723^2
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=e0f7de6ad52853944674df02b7744fab95132c49;p=lhc%2Fweb%2Fwiklou.git
Add attributes to the Parsoid-only tests.
Needed to fix these up in order to get them running right when the Parsoid
test-runner begins to let through more attributes.
Several tests are make wt2html/wt2wt only because they involve templates
which we can't convert from html2wt without additional information.
The "SOL-sensitive wikitext tokens" test was previously wrong: the PHP
preprocessor generates lists from the template content. Updated it to
the proper results while adding attributes, although it will currently
fail until we either fix the native Parsoid preprocessor or tweak our
parserTests to use the PHP preprocessor.
Co-Author: Mark Holmquist
Co-Author: C. Scott Ananian
Change-Id: I657e4869fb0c2ae66d6732d28c6fc6645ad8e534
---
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 71b9e6ba15..24dbc97045 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -2376,8 +2376,25 @@ parsoid
*#*#;*;;foo :bar
*#*#;boo :baz
!! result
-
+
!! end
@@ -2406,7 +2423,23 @@ parsoid
!! input
*#;*::;; foo : bar (who uses this?)
!! result
-
+
+-
+
+-
+
+-
+
+-
+
+-
+
+-
+
+-
+
+- foo
+- bar (who uses this?)
!! end
###
@@ -6177,13 +6210,13 @@ bar baz
!!test
Templates: P-wrapping: 1d. Template preceded by comment-only line
!!options
-parsoid
+parsoid=wt2html,wt2wt
!!input
{{echo|Bar}}
!!result
-Bar
+
Bar
!!end
@@ -6571,24 +6604,24 @@ Templates: Ugly nesting: 1. Quotes opened/closed across templates (echo)
Templates: Ugly nesting: 2. Quotes opened/closed across templates (echo_with_span)
(PHP parser generates misnested html)
!! options
-parsoid
+parsoid=wt2html,wt2wt
!!input
{{echo_with_span|''a}}{{echo_with_span|b''c''d}}{{echo_with_span|''e}}
!!result
-abcde
+abcde
!!end
!!test
Templates: Ugly nesting: 3. Quotes opened/closed across templates (echo_with_div)
(PHP parser generates misnested html)
!! options
-parsoid
+parsoid=wt2html,wt2wt
!!input
{{echo_with_div|''a}}{{echo_with_div|b''c''d}}{{echo_with_div|''e}}
!!result
-a
-bcd
-e
+a
+bcd
+e
!!end
!!test
@@ -6611,10 +6644,10 @@ parsoid
|bar
|}
!!result
-
-bar
-
+bar
!!end
!!test
@@ -6822,10 +6855,13 @@ wikinowiki=foo=
-
=fooa=
-
+=foo=
+
+ =foo=
+
+=foo=
+
+=fooa=
!!end
!! test
@@ -13700,12 +13740,12 @@ parsoid
======foo======
=======foo=======
!! result
-=foo=
-=foo=
-=foo=
-=foo=
-=foo=
-=foo=
+=foo=
+=foo=
+=foo=
+=foo=
+=foo=
+=foo=
!!end
!! test
@@ -13732,7 +13772,7 @@ parsoid
!! input
=='''bold'''foo==
!! result
-=boldfoo=
+=boldfoo=
!!end
!! test
@@ -13756,8 +13796,7 @@ parsoid
=foo
foo=
=foo=
-=
-
+=
!!end
!! test
@@ -13803,9 +13842,8 @@ parsoid
=h1=
=h1=
!! result
-=h1=
- =h1=
-
+=h1=
+ =h1=
!!end
#### --------------- Lists ---------------
@@ -13922,7 +13960,7 @@ parsoid
-- Foo: bar
+
!!end
@@ -13963,8 +14001,7 @@ parsoid
!! input
*foo
!! result
-
*foo
-
+*foo
!!end
!! test
@@ -13991,7 +14028,7 @@ parsoid
----=foo=
----*foo
!! result
-
----
+
----
=foo=
*foo
!! end
@@ -14062,10 +14099,8 @@ parsoid
|foo|bar
|}
!! result
-
-
+
!! end
!! test
@@ -14078,11 +14113,9 @@ parsoid
|''it''foo||bar
|}
!! result
-
-
+
!! end
!! test
@@ -14094,8 +14127,7 @@ parsoid
|foo!!bar
|}
!! result
-
-foo!!bar
+
!! end
@@ -14109,8 +14141,7 @@ parsoid
!foo!bar
|}
!! result
-
-foo!bar
+
!! end
@@ -14124,10 +14155,9 @@ parsoid
!foo!!bar
|}
!! result
-
-
+
!! end
!! test
@@ -14139,10 +14169,8 @@ parsoid
!foo||bar
|}
!! result
-
-
+
!! end
!! test
@@ -14159,8 +14187,8 @@ parsoid
!! result
+ |
---|
+-bar |
!! end
!! test
@@ -14177,8 +14205,8 @@ parsoid
!! result
+ |
++bar |
!! end
!! test
@@ -14739,7 +14767,7 @@ Indented table with an empty td
Empty TR followed by a template-generated TR
(Parsoid-specific since PHP parser doesn't handle this mixed tbl-wikitext)
!!options
-parsoid
+parsoid=wt2html,wt2wt
!!input
{|
|-
@@ -14748,9 +14776,8 @@ parsoid
!!result
!!end