Fix tests

nextjournal · Nov 21, 2023 · df5f555 · df5f555
1 parent b681d57
commit df5f555
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/test/nextjournal/clerk/eval_test.clj b/test/nextjournal/clerk/eval_test.clj
@@ -142,7 +142,9 @@
       eval/eval-string
       view/doc->viewer
       :nextjournal/value
-      :blocks))
+      :blocks
+      ;; remove hidden results
+      (->> (remove (comp #{:hide} :result :nextjournal/visibility :nextjournal/presented :nextjournal/value)))))
 
 (deftest eval-string+doc->viewer
   (testing "assigns correct width from viewer function opts"
@@ -240,4 +242,3 @@
              (catch Exception _ nil))
         (clerk/show! (java.io.StringReader. code))
         (is (= result-first-run (get-result)))))))
-
diff --git a/test/nextjournal/clerk/viewer_test.clj b/test/nextjournal/clerk/viewer_test.clj
@@ -86,7 +86,7 @@
 (deftest default-viewers
   (testing "viewers have names matching vars"
     (doseq [[viewer-name viewer] (into {}
-                                       (map (juxt :name (comp deref resolve :name))) 
+                                       (map (juxt :name (comp deref resolve :name)))
                                        v/default-viewers)]
       (is (= viewer-name (:name viewer))))))
 
@@ -307,22 +307,22 @@
   (testing "Settings propagation from ns to form"
     (is (= :full
            (-> (eval/eval-string "(ns nextjournal.clerk.viewer-test.settings {:nextjournal.clerk/width :full}) (nextjournal.clerk/html [:div])")
-               view/doc->viewer v/->value :blocks (nth 2)
+               view/doc->viewer v/->value :blocks (nth 3)
                v/->value :nextjournal/presented :nextjournal/width)))
 
     (is (= :wide
            (-> (eval/eval-string "(ns nextjournal.clerk.viewer-test.settings {:nextjournal.clerk/width :full}) (nextjournal.clerk/html {:nextjournal.clerk/width :wide} [:div])")
-               view/doc->viewer v/->value :blocks (nth 2)
+               view/doc->viewer v/->value :blocks (nth 3)
                v/->value :nextjournal/presented :nextjournal/width)))
 
     (is (= :wide
            (-> (eval/eval-string "(ns nextjournal.clerk.viewer-test.settings {:nextjournal.clerk/width :full}) ^{:nextjournal.clerk/width :wide} (nextjournal.clerk/html [:div])")
-               view/doc->viewer v/->value :blocks (nth 2)
+               view/doc->viewer v/->value :blocks (nth 3)
                v/->value :nextjournal/presented :nextjournal/width)))
 
     (is (= :wide
            (-> (eval/eval-string "(ns nextjournal.clerk.viewer-test.settings {:nextjournal.clerk/width :full}) {:nextjournal.clerk/width :wide} (nextjournal.clerk/html [:div])")
-               view/doc->viewer v/->value :blocks (nth 2)
+               view/doc->viewer v/->value :blocks (nth 4)
                v/->value :nextjournal/presented :nextjournal/width))))
 
   (testing "Presented doc (with fragments) has unambiguous ids assigned to results"
@@ -397,7 +397,7 @@
   (is (= "(do 'this)"
          (-> (eval/eval-string "(ns test.removed-metadata\n(:require [nextjournal.clerk :as c]))\n\n^::c/no-cache (do 'this)")
              view/doc->viewer
-             v/->value :blocks second v/->value))))
+             v/->value :blocks (nth 2) v/->value))))
 
 (deftest col-viewer-map-args
   (testing "extracts first arg as viewer-opts"