+
")))
diff --git a/test/cryogen_core/klipse_test.clj b/test/cryogen_core/klipse_test.clj
new file mode 100644
index 0000000..33b15f6
--- /dev/null
+++ b/test/cryogen_core/klipse_test.clj
@@ -0,0 +1,75 @@
+(ns cryogen-core.klipse-test
+ (:require [cryogen-core.klipse :refer :all]
+ [clojure.test :refer [deftest testing is are]]))
+
+(deftest map-keys-test
+ (is (= {"a" 1 "b" 2} (map-keys name {:a 1 :b 2}))))
+
+(deftest update-existing-test
+ (is (= {:a 1 :b 2} (update-existing {:a 1 :b 1} :b inc)))
+ (is (= {:a 1} (update-existing {:a 1} :b (constantly 2)))))
+
+(deftest deep-merge-test
+ (is (= {:a {:b 1 :c 2}} (deep-merge {:a {:b 1}} {:a {:c 2}})))
+ (is (= {:a {:b 1}} (deep-merge {:a {:b 1}} {:a nil})))
+ (is (= {:a {:b 1 :c 3}} (deep-merge {:a {:b 1 :c 2}} {:a {:c 3}}))))
+
+;; For testing convenience.
+(defn elt
+ "Returns an enlive style html element."
+ ([tag] (elt tag nil))
+ ([tag attrs & content]
+ {:tag tag, :attrs attrs, :content content}))
+
+(deftest filter-html-elems-test
+ (is (= [(elt :div {:class "x"} :content [(elt :div {:class "x"} "foo")])
+ (elt :div {:class "x"} "foo")])
+ (filter-html-elems (comp #{"x"} :class :attrs)
+ [(elt :h1 {:class "y"} "things!")
+ (elt :div {:class "x"} (elt :div {:class "x"} "foo"))])))
+
+(deftest code-block-classes-test
+ (is (= ["clojure" "ruby"]
+ (code-block-classes
+ "
this post has more marker
stuff
+(def x 42)" - (generate-toc htmlString :list-type :ul))))) - - + (generate-toc htmlString :list-type :ul)))))123")))) + +(deftest clojure-eval-classes-test + (is (= #{"eval-cljs" "eval-reagent"} + (clojure-eval-classes {"selector" ".eval-cljs" + "selector_reagent" ".eval-reagent" + "selector_eval_ruby" ".eval-ruby"})))) + +(deftest clojure-eval?-test + (is (clojure-eval? {"selector" ".eval-cljs"} + "stuff
++(def x 42)123")) + + (is (not (clojure-eval? {"selector" ".eval-cljs" + "selector_eval_ruby" ".eval-ruby"} + "stuff
+123")))) + +(deftest normalize-settings-test + (is (= {"selector_reagent" ".reagent" + "codemirror_options_in" {"lineNumbers" true}} + (normalize-settings + {:selector-reagent ".reagent" + :codemirror-options-in {:line-numbers true}})))) + +(deftest merge-configs-test + (testing "Things are merged correctly" + (is (= (merge defaults + {:settings {"selector" ".clojure-eval" + "codemirror_options_in" {"lineNumbers" true}}}) + (merge-configs {:settings {:codemirror-options-in {:line-numbers true}}} + {:settings {:selector ".clojure-eval"}})))) + + (testing "If it's all set up in config.edn, in the post it can be just :klipse true" + (is (= (merge defaults {:settings {"selector_js" ".javascript"}}) + (merge-configs {:settings {:selector-js ".javascript"}} true)))) + + (testing "Returns nil if there's nothing in the blog post" + (is (nil? (merge-configs {:settings {:selector ".clojure-eval"}} nil))))) diff --git a/test/cryogen_core/toc_test.clj b/test/cryogen_core/toc_test.clj index 4a608e9..83bb390 100644 --- a/test/cryogen_core/toc_test.clj +++ b/test/cryogen_core/toc_test.clj @@ -1,38 +1,35 @@ (ns cryogen-core.toc-test (:require [clojure.test :refer :all] - [clojure.string :refer [join]] - [clojure.zip :as z] - [crouton.html :as html] + [clojure.string :as s] + [net.cgrand.enlive-html :as enlive] [hiccup.core :as hiccup] [cryogen-core.toc :refer :all])) ; Reimport private functions (def get-headings #'cryogen-core.toc/get-headings) (def make-toc-entry #'cryogen-core.toc/make-toc-entry) -(def zip-toc-tree-to-insertion-point #'cryogen-core.toc/zip-toc-tree-to-insertion-point) -(def insert-toc-tree-entry #'cryogen-core.toc/insert-toc-tree-entry) (def build-toc-tree #'cryogen-core.toc/build-toc-tree) (def build-toc #'cryogen-core.toc/build-toc) (defn parse-to-headings [hiccup-seq] - (-> hiccup-seq hiccup/html html/parse-string :content get-headings)) + (-> hiccup-seq hiccup/html enlive/html-snippet get-headings)) ; Test that the get-headings function properly filters non-headers (deftest test-get-headings (let [noisy-headers [:div [:h1 "First H1"] - [:p "Ignore..."] - [:h2 "First H2"]]] + [:p "Ignore..."] + [:h2 "First H2"]]] (is (= (parse-to-headings noisy-headers) - [{:tag :h1 :attrs nil :content ["First H1"]} - {:tag :h2 :attrs nil :content ["First H2"]}])))) + [{:tag :h1 :attrs nil :content ["First H1"]} + {:tag :h2 :attrs nil :content ["First H2"]}])))) ; Test that the make-toc-entry ignores invalid input (deftest test-make-toc-entry (is (nil? - (make-toc-entry nil "Text"))) + (make-toc-entry nil "Text"))) (is (nil? - (make-toc-entry "anchor" nil))) + (make-toc-entry "anchor" nil))) (is (= [:li [:a {:href "#anchor"} "Text"]] (make-toc-entry "anchor" "Text")))) @@ -45,65 +42,62 @@ ; * h1 (deftest test-build-toc (let [simplest-header [:div [:h2 [:a {:name "test"}] "Test"]] - no-headers [:div [:p "This is not a header"]] + no-headers [:div [:p "This is not a header"]] + closing-header-larger-than-opening-1 - [:div [:h2 [:a {:name "starting_low"}] - "Starting Low"] - [:h1 [:a {:name "finishing_high"}] - "Finishing High"]] + [:div [:h2 [:a {:name "starting_low"}] + "Starting Low"] + [:h1 [:a {:name "finishing_high"}] + "Finishing High"]] + closing-header-larger-than-opening-2 - [:div [:h2 [:a {:name "starting_low"}] - "Starting Low"] - [:h4 [:a {:name "jumping_in"}] - "Jumping Right In"] - [:h3 [:a {:name "pulling_back"}] - "But then pull back"] - [:h2 [:a {:name "to_the_top"}] - "To the top"]]] + [:div [:h2 [:a {:name "starting_low"}] + "Starting Low"] + [:h4 [:a {:name "jumping_in"}] + "Jumping Right In"] + [:h3 [:a {:name "pulling_back"}] + "But then pull back"] + [:h2 [:a {:name "to_the_top"}] + "To the top"]]] (is (= [:ol.content (seq [[:li [:a {:href "#test"} "Test"]]])] - (-> simplest-header parse-to-headings build-toc-tree + (-> simplest-header + (parse-to-headings) + (build-toc-tree) (build-toc :ol)))) - (is (nil? - (-> no-headers parse-to-headings build-toc-tree - (build-toc :ol)))) + (is (-> no-headers + (parse-to-headings) + (build-toc-tree) + (build-toc :ol) + (nil?))) (is (= [:ol.content (seq [[:li [:a {:href "#starting_low"} "Starting Low"]] [:li [:a {:href "#finishing_high"} "Finishing High"]]])] - (-> closing-header-larger-than-opening-1 - parse-to-headings - build-toc-tree - (build-toc :ol))) + (-> closing-header-larger-than-opening-1 + (parse-to-headings) + (build-toc-tree) + (build-toc :ol))) "No outer header should be less indented than the first header tag.") - (is (= [:ul.content - (seq [ - (seq [ - [:li [:a {:href "#starting_low"} "Starting Low"]] - [:ul - (seq [ - [:li [:a {:href "#jumping_in"} "Jumping Right In"]] - [:li [:a {:href "#pulling_back"} "But then pull back"]] - ]) - ] ]) - [:li [:a {:href "#to_the_top"} "To the top"]] - ])] + (is (= [:ul.content + (seq [(seq [[:li [:a {:href "#starting_low"} "Starting Low"]] + [:ul + (seq [[:li [:a {:href "#jumping_in"} "Jumping Right In"]] + [:li [:a {:href "#pulling_back"} "But then pull back"]]])]]) + [:li [:a {:href "#to_the_top"} "To the top"]]])] (-> closing-header-larger-than-opening-2 - parse-to-headings - build-toc-tree + (parse-to-headings) + (build-toc-tree) (build-toc :ul))) - (join "" ["Inner headers can be more indented, " - "but outer headers cannot be less indented " - "than the original header."])) - )) + (s/join "" ["Inner headers can be more indented, " + "but outer headers cannot be less indented " + "than the original header."])))) (deftest test-generate-toc (let [htmlString ""] (is (= "" - (generate-toc htmlString))) + (generate-toc htmlString))) (is (= "" - (generate-toc htmlString :list-type true))) + (generate-toc htmlString :list-type true))) (is (= "" - (generate-toc htmlString :list-type :ol))) + (generate-toc htmlString :list-type :ol))) (is (= "