make some html equality tests more lenient

8 years ago · 77688688f2
parent a633eac8df
commit 77688688f2
3 changed files with 10 additions and 8 deletions
--- a/pollen/private/ts.rktd
+++ b/pollen/private/ts.rktd
@ -1 +1 @@
-1475981471
+1475983782
--- 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) "<html><head><meta charset=\"UTF-8\"/></head><body><root>test\n====</root></body></html>")
-  (check-equal? (render test.html.pmd) "<html><head><meta charset=\"UTF-8\"/></head><body><root><h1 id=\"test\">test</h1></root></body></html>")
-  (check-equal? (render test.html.pp) "test\n====")
-  (check-equal? (render test.pm) "<html><head><meta charset=\"UTF-8\"/></head><body><root>test\n====</root></body></html>")
-  (check-equal? (render test.pp) "test\n===="))
+  (check-txexprs-equal? (html->xexpr (render test.html.pm)) (html->xexpr "<html><head><meta charset=\"UTF-8\"/></head><body><root>test\n====</root></body></html>"))
+  (check-txexprs-equal? (html->xexpr (render test.html.pmd)) (html->xexpr "<html><head><meta charset=\"UTF-8\"/></head><body><root><h1 id=\"test\">test</h1></root></body></html>"))
+  (check-txexprs-equal? (render test.html.pp) "test\n====")
+  (check-txexprs-equal? (html->xexpr (render test.pm)) (html->xexpr "<html><head><meta charset=\"UTF-8\"/></head><body><root>test\n====</root></body></html>"))
+  (check-txexprs-equal? (render test.pp) "test\n===="))
--- 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