From 77688688f21fc886b263d7fa4e286147f7320306 Mon Sep 17 00:00:00 2001 From: Matthew Butterick Date: Sat, 8 Oct 2016 20:29:42 -0700 Subject: [PATCH] make some html equality tests more lenient --- pollen/private/ts.rktd | 2 +- pollen/test/test-langs.rkt | 14 ++++++++------ pollen/unstable/convert.rkt | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/pollen/private/ts.rktd b/pollen/private/ts.rktd index 44d437e..4113786 100644 --- a/pollen/private/ts.rktd +++ b/pollen/private/ts.rktd @@ -1 +1 @@ -1475981471 +1475983782 diff --git a/pollen/test/test-langs.rkt b/pollen/test/test-langs.rkt index e1c22ef..780621b 100644 --- a/pollen/test/test-langs.rkt +++ b/pollen/test/test-langs.rkt @@ -4,7 +4,9 @@ racket/system racket/runtime-path compiler/find-exe - pollen/render) + pollen/render + pollen/unstable/convert + txexpr) (module test-default pollen "hello world") @@ -61,8 +63,8 @@ (check-equal? (run test.no-ext) "test\n====") (check-equal? (run test.pm) "'(root \"test\" \"\\n\" \"====\")") (check-equal? (run test.pp) "test\n====") - (check-equal? (render test.html.pm) "test\n====") - (check-equal? (render test.html.pmd) "

test

") - (check-equal? (render test.html.pp) "test\n====") - (check-equal? (render test.pm) "test\n====") - (check-equal? (render test.pp) "test\n====")) + (check-txexprs-equal? (html->xexpr (render test.html.pm)) (html->xexpr "test\n====")) + (check-txexprs-equal? (html->xexpr (render test.html.pmd)) (html->xexpr "

test

")) + (check-txexprs-equal? (render test.html.pp) "test\n====") + (check-txexprs-equal? (html->xexpr (render test.pm)) (html->xexpr "test\n====")) + (check-txexprs-equal? (render test.pp) "test\n====")) diff --git a/pollen/unstable/convert.rkt b/pollen/unstable/convert.rkt index 5a0c625..126ee95 100644 --- a/pollen/unstable/convert.rkt +++ b/pollen/unstable/convert.rkt @@ -55,7 +55,7 @@ You are kitty}") (define (conjoin . fs) (λ(x) (andmap (λ(f) (f x)) fs))) -(define/contract (html->xexpr html-string) +(define/contract+provide (html->xexpr html-string) (string? . -> . xexpr?) (use-html-spec #f) (define xexpr-results