Update tests for <isindex> removal from the spec

Ref. whatwg/html#1095
html5lib · Apr 22, 2016 · f99e2cb · f99e2cb
1 parent 6234bae
commit f99e2cb
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 124 deletions.
diff --git a/tree-construction/isindex.dat b/tree-construction/isindex.dat
@@ -2,46 +2,48 @@
 <isindex>
 #errors
 (1,9): expected-doctype-but-got-start-tag
-(1,9): deprecated-tag
+(1,9): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
 |   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|       <hr>
+|     <isindex>
 
 #data
 <isindex name="A" action="B" prompt="C" foo="D">
 #errors
 (1,48): expected-doctype-but-got-start-tag
-(1,48): deprecated-tag
+(1,48): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
 |   <body>
-|     <form>
+|     <isindex>
 |       action="B"
-|       <hr>
-|       <label>
-|         "C"
-|         <input>
-|           foo="D"
-|           name="isindex"
-|       <hr>
+|       foo="D"
+|       name="A"
+|       prompt="C"
 
 #data
 <form><isindex>
 #errors
 (1,6): expected-doctype-but-got-start-tag
-(1,15): deprecated-tag
 (1,15): expected-closing-tag-but-got-eof
 #document
 | <html>
 |   <head>
 |   <body>
 |     <form>
+|       <isindex>
+
+#data
+<!doctype html><isindex>x</isindex>x
+#errors
+#document
+| <!DOCTYPE html>
+| <html>
+|   <head>
+|   <body>
+|     <isindex>
+|       "x"
+|     "x"
diff --git a/tree-construction/tests19.dat b/tree-construction/tests19.dat
@@ -81,87 +81,17 @@
 |     <p>
 |     <h1>
 
-#data
-<!doctype html><form><isindex>
-#errors
-(1,30): deprecated-tag
-(1,30): expected-closing-tag-but-got-eof
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-
-#data
-<!doctype html><isindex action="POST">
-#errors
-(1,38): deprecated-tag
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       action="POST"
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|       <hr>
-
-#data
-<!doctype html><isindex prompt="this is isindex">
-#errors
-(1,49): deprecated-tag
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "this is isindex"
-|         <input>
-|           name="isindex"
-|       <hr>
-
 #data
 <!doctype html><isindex type="hidden">
 #errors
-(1,38): deprecated-tag
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|           type="hidden"
-|       <hr>
-
-#data
-<!doctype html><isindex name="foo">
-#errors
-(1,35): deprecated-tag
+(1,38): expected-closing-tag-but-got-eof
 #document
 | <!DOCTYPE html>
 | <html>
 |   <head>
 |   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|       <hr>
+|     <isindex>
+|       type="hidden"
 
 #data
 <!doctype html><ruby><p><rp>

diff --git a/tree-construction/tests2.dat b/tree-construction/tests2.dat
@@ -553,24 +553,6 @@
 |   <head>
 |   <body>
 
-#data
-<isindex test=x name=x>
-#errors
-(1,23): expected-doctype-but-got-start-tag
-(1,23): deprecated-tag
-#document
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|           test="x"
-|       <hr>
-
 #data
 test
 test

diff --git a/tree-construction/webkit02.dat b/tree-construction/webkit02.dat
@@ -256,21 +256,6 @@ div
 | <aside>
 |   <b>
 
-#data
-<isindex action="x">
-#errors
-#document-fragment
-table
-#document
-| <form>
-|   action="x"
-|   <hr>
-|   <label>
-|     "This is a searchable index. Enter search keywords: "
-|     <input>
-|       name="isindex"
-|   <hr>
-
 #data
 <option><XH<optgroup></optgroup>
 #errors