Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the usage of type selector in :has() #57

Merged
merged 4 commits into from
Aug 21, 2024
Merged

Fix the usage of type selector in :has() #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e30077b
exclude text nodes from counting in :has() selector
jbhoot Jul 25, 2024
5c1033c
diversify test cases for :has() selector
jbhoot Jul 25, 2024
596e776
improve assertion error messages with a printer
jbhoot Jul 25, 2024
3733caa
Tests: avoid long lines
aantron Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/soup.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,7 @@ struct
| Content s -> texts node |> String.concat "" |> has_substring s
| Has selector ->
descendants node
|> filter (fun descendant -> not (is_text descendant))
|> filter (fun descendant -> matches_simple_selector descendant selector)
|> count
|> fun count -> count > 0
Expand Down
27 changes: 17 additions & 10 deletions test/test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ let suites = [
("parse-select-list" >:: fun _ ->
let soup = page "list" |> parse in
let test selector expected_count =
assert_equal ~msg:selector
assert_equal ~msg:selector ~printer:string_of_int
(soup |> select selector |> count) expected_count
in

Expand Down Expand Up @@ -122,11 +122,14 @@ let suites = [
test "p:empty" 1;
test "ul li:not(:nth-child(1))" 2;
test ":not(ul) > li" 2;
test ":has([id=one])" 3;
test ":has(#one)" 3;
test "ul:has([id=one])" 1;
test "ol:has([id=one])" 0;
test "ol:has(#one)" 0;
test "li:has([id=one])" 0;
test ":has(.odd)" 4;
test "ul:has(.even)" 1;
test ":has(ul)" 2;
test ":has(caption)" 0;
test
("html:root > body.lists[class~=lists] > ul > li#one:nth-child(1) " ^
"+ li#two")
Expand All @@ -135,7 +138,7 @@ let suites = [
("parse-select-quoted" >:: fun _ ->
let soup = page "quoted" |> parse in
let test selector expected_count =
assert_equal ~msg:selector
assert_equal ~msg:selector ~printer:string_of_int
(soup |> select selector |> count) expected_count
in

Expand Down Expand Up @@ -182,7 +185,7 @@ let suites = [
("parse-select-escaped" >:: fun _ ->
let soup = page "quoted" |> parse in
let test selector expected_count =
assert_equal ~msg:selector
assert_equal ~msg:selector ~printer:string_of_int
(soup |> select selector |> count) expected_count
in

Expand All @@ -203,7 +206,8 @@ let suites = [
("parse-select-html5" >:: fun _ ->
let soup = page "html5" |> parse in
let test selector expected_count =
assert_equal ~msg:selector (soup $$ selector |> count) expected_count
assert_equal ~msg:selector ~printer:string_of_int
(soup $$ selector |> count) expected_count
in

test "nav" 1;
Expand All @@ -215,7 +219,8 @@ let suites = [
test "footer" 1);

("parse-select-google" >:: fun _ ->
assert_equal (page "google" |> parse $$ "form[action]" |> count) 1);
assert_equal ~printer:string_of_int
(page "google" |> parse $$ "form[action]" |> count) 1);

("parse-error" >:: fun _ ->
let soup = parse "<p></p>" in
Expand Down Expand Up @@ -285,7 +290,7 @@ let suites = [
("generalized-select" >:: fun _ ->
let soup = page "list" |> parse in
let test root selector expected_count =
assert_equal ~msg:selector
assert_equal ~msg:selector ~printer:string_of_int
(root |> select selector |> count) expected_count
in

Expand All @@ -298,7 +303,8 @@ let suites = [

("select-attribute-operators" >:: fun _ ->
let soup = "<form action=\"/continue\"></form>" |> parse in
assert_equal (soup $$ "form[action=/continue]" |> count) 1);
assert_equal ~printer:string_of_int
(soup $$ "form[action=/continue]" |> count) 1);

("select_one" >:: fun _ ->
let soup = page "list" |> parse in
Expand Down Expand Up @@ -378,7 +384,8 @@ let suites = [
("matches-selector" >:: fun _ ->
let soup = parse "<div> <p id='foo'>bar</p> </div>" in
let elem = select_one "div p#foo" soup |> unwrap_option in
assert_bool "element matches selector" (matches_selector soup "div p#foo" elem)
assert_bool "element matches selector"
(matches_selector soup "div p#foo" elem)
);

("fold_attributes" >:: fun _ ->
Expand Down