Skip to content

Commit

Permalink
adding void element consideration for ul/ol childs
Browse files Browse the repository at this point in the history
  • Loading branch information
@paganotoni
paganotoni committed Sep 6, 2020
1 parent 5ee94c1 commit d2d59a3
Show file tree
Hide file tree
Showing 3 changed files with 165 additions and 128 deletions.
4 changes: 2 additions & 2 deletions external/html/render.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ func render1(w writer, n *Node) error {
return err
}
}
if voidElements[n.Data] {
if VoidElements[n.Data] {
if n.FirstChild != nil {
return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
}
Expand Down Expand Up @@ -254,7 +254,7 @@ func writeQuoted(w writer, s string) error {

// Section 12.1.2, "Elements", gives this list of void elements. Void elements
// are those that can't have any contents.
var voidElements = map[string]bool{
var VoidElements = map[string]bool{
"area": true,
"base": true,
"br": true,
Expand Down
5 changes: 5 additions & 0 deletions reviewers/list_child_valid.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,11 @@ func (ol ListChildValid) Review(path string, page io.Reader) ([]Fault, error) {
})
}

// Checking if its a void tag
if html.VoidElements[token.Data] {
continue
}

parents = append([]html.Token{token}, parents...)

case html.EndTagToken:
Expand Down
284 changes: 158 additions & 126 deletions reviewers/list_child_valid_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,140 +20,172 @@ func Test_ListChildValid_Review(t *testing.T) {
faultsLen int
fault []reviewers.Fault
}{
{
name: "no ol/ul specified",
faultsLen: 0,
content: `
<html>
<body></body>
</html>`,
},

{
name: "ol/ul specified correctly",
faultsLen: 0,
content: `
<ol>
<li></li>
</ol>
<ul>
<li></li>
</ul>
`,
},

{
name: "lonely one",
faultsLen: 0,
content: `
<li></li>
`,
},
// {
// name: "no ol/ul specified",
// faultsLen: 0,
// content: `
// <html>
// <body></body>
// </html>`,
// },

// {
// name: "ol/ul specified correctly",
// faultsLen: 0,
// content: `
// <ol>
// <li></li>
// </ol>
// <ul>
// <li></li>
// </ul>
// `,
// },

// {
// name: "lonely one",
// faultsLen: 0,
// content: `
// <li></li>
// `,
// },

// {
// name: "self closing",
// faultsLen: 0,
// content: `
// </div>
// `,
// },

{
name: "self closing",
name: "from real",
faultsLen: 0,
content: `
<div class="d-flex flex-column mb-1">
<div class="form-group dropdown select-filter multiple">
<label for="HotelsID">Hotel</label>
<button class="form-control d-none d-lg-flex justify-content-between align-items-center dropdown-toggle select-label" type="button" id="HotelsID" data-toggle="dropdown" data-target="#HotelsDropown" aria-expanded="false" aria-label="Hotel"></button>
<div id="HotelsDropown" class="dropdown-menu select-menu" aria-labelledby="HotelsID">
<ul class="select-menu-list">
<%= for (index, hotel) in hotels { %>
<li class="select-item">
<div class="custom-control custom-checkbox d-flex align-items-center">
<input type="checkbox" class="custom-control-input" id="hotels<%= index %>" name="HotelsID" value="<%= hotel.ID %>" <%= if (containsUUID(filter.HotelsID, hotel.ID)) { %> checked<% } %>>
<label class="custom-control-label m-0 p-0" for="hotels<%= index %>">
<span class="font-13 text-dark ml-2"><%= hotel.Name %></span>
</label>
</div>
</li>
<% } %>
</ul>
<div class="d-none justify-content-end align-items-center border-top px-2 py-3">
<button type="button" class="btn btn-link" data-action="clear">Clear</button>
<button type="submit" class="btn btn-primary ml-4">Apply</button>
</div>
</div>
</div>
</div>
`,
},

{
fault: []reviewers.Fault{
{
Reviewer: doc.ReviewerName(),
Line: 3,
Col: 5,
Rule: reviewers.Rules[doc.ReviewerName()],
},

{
Reviewer: doc.ReviewerName(),
Line: 4,
Rule: reviewers.Rules[doc.ReviewerName()],
},
{
Reviewer: doc.ReviewerName(),
Line: 7,
Col: 5,
Rule: reviewers.Rules[doc.ReviewerName()],
},

{
Reviewer: doc.ReviewerName(),
Line: 8,
Col: 5,
Rule: reviewers.Rules[doc.ReviewerName()],
},
},
name: "ol/ul invalid",
faultsLen: 4,
content: `
<ol>
<label></label>
<div></div>
</ol>
<ul>
<label></label>
<div></div>
</ul>
`,
},

{
fault: []reviewers.Fault{
{
Reviewer: doc.ReviewerName(),
Line: 5,
Col: 7,
Rule: reviewers.Rules[doc.ReviewerName()],
},
{
Reviewer: doc.ReviewerName(),
Line: 13,
Col: 7,
Rule: reviewers.Rules[doc.ReviewerName()],
},
},

name: "inner ol/ul invalid",
faultsLen: 2,
content: `
<ol>
<li>
<ol>
<label></label>
</ol>
</li>
</ol>
<ul>
<li>
<ul>
<label></label>
</ul>
</li>
</ul>
`,
},

{
name: "reported case",
faultsLen: 0,
content: `
<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<title>Contact Us</title>
</head>
<body>
<ul class="mainMenu nav nav-pills">
<li><i/> Home</li>
</ul>
</body>
</html>
`,
},
// {
// fault: []reviewers.Fault{
// {
// Reviewer: doc.ReviewerName(),
// Line: 3,
// Col: 5,
// Rule: reviewers.Rules[doc.ReviewerName()],
// },

// {
// Reviewer: doc.ReviewerName(),
// Line: 4,
// Rule: reviewers.Rules[doc.ReviewerName()],
// },
// {
// Reviewer: doc.ReviewerName(),
// Line: 7,
// Col: 5,
// Rule: reviewers.Rules[doc.ReviewerName()],
// },

// {
// Reviewer: doc.ReviewerName(),
// Line: 8,
// Col: 5,
// Rule: reviewers.Rules[doc.ReviewerName()],
// },
// },
// name: "ol/ul invalid",
// faultsLen: 4,
// content: `
// <ol>
// <label></label>
// <div></div>
// </ol>
// <ul>
// <label></label>
// <div></div>
// </ul>
// `,
// },

// {
// fault: []reviewers.Fault{
// {
// Reviewer: doc.ReviewerName(),
// Line: 5,
// Col: 7,
// Rule: reviewers.Rules[doc.ReviewerName()],
// },
// {
// Reviewer: doc.ReviewerName(),
// Line: 13,
// Col: 7,
// Rule: reviewers.Rules[doc.ReviewerName()],
// },
// },

// name: "inner ol/ul invalid",
// faultsLen: 2,
// content: `
// <ol>
// <li>
// <ol>
// <label></label>
// </ol>
// </li>
// </ol>

// <ul>
// <li>
// <ul>
// <label></label>
// </ul>
// </li>
// </ul>
// `,
// },

// {
// name: "reported case",
// faultsLen: 0,
// content: `
// <!DOCTYPE html>
// <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
// <head>
// <title>Contact Us</title>
// </head>
// <body>
// <ul class="mainMenu nav nav-pills">
// <li><i/> Home</li>
// </ul>
// </body>
// </html>
// `,
// },
}

for _, tcase := range tcases {
Expand Down

0 comments on commit d2d59a3

Please sign in to comment.