From 349a4a220167de3d58a59107b423c1d08b53598c Mon Sep 17 00:00:00 2001
From: Morgan Astra <m@morganastra.me>
Date: Sat, 24 Sep 2016 01:28:13 -0700
Subject: [PATCH] use midje for testing per #57

---
 project.clj                  |  3 ++-
 src/pronouns/pages.clj       |  8 ++++----
 test/pronouns/pages_test.clj | 10 ++++++++++
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 test/pronouns/pages_test.clj

diff --git a/project.clj b/project.clj
index cddf5f3..ae66432 100644
--- a/project.clj
+++ b/project.clj
@@ -14,5 +14,6 @@
             [lein-ring "0.9.7"]]
   :hooks [environ.leiningen.hooks]
   :uberjar-name "pronouns-standalone.jar"
-  :profiles {:production {:env {:production true}}}
+  :profiles {:production {:env {:production true}}
+             :dev {:dependencies [[midje "1.6.3"]]}}
   :ring {:handler pronouns.web/app})
diff --git a/src/pronouns/pages.clj b/src/pronouns/pages.clj
index 5b2ad36..9c1e02b 100644
--- a/src/pronouns/pages.clj
+++ b/src/pronouns/pages.clj
@@ -25,7 +25,7 @@
   [items]
   (let [c (count items)]
     (cond
-      (<= c 1) (first items)
+      (<= c 1) (or (first items) "")
       (= c 2) (s/join " and " items)
       :else (str (s/join ", " (butlast items)) ", and " (last items)))))
 
@@ -122,7 +122,7 @@
        [:meta {:name "viewport" :content "width=device-width"}]
        [:link {:rel "stylesheet" :href "/pronouns.css"}]]
       [:body
-       (title-block title)
+       (header-block title)
        (map #(apply examples-block %) pronoun-declensions)
        (footer-block)]])))
 
@@ -149,7 +149,7 @@
        [:meta {:name "viewport" :content "width=device-width"}]
        [:link {:rel "stylesheet" :href "/pronouns.css"}]]
       [:body
-       (title-block title)
+       (header-block title)
        [:div {:class "section table"}
        [:p "pronoun.is is a website for personal pronoun usage examples"]
        [:p "here are some pronouns the site knows about:"]
@@ -165,7 +165,7 @@
        [:meta {:name "viewport" :content "width=device-width"}]
        [:link {:rel "stylesheet" :href "/pronouns.css"}]]
       [:body
-       (title-block title)
+       (header-block title)
       [:div {:class "section examples"}
        [:p [:h2 (str "We couldn't find those pronouns in our database."
                      "If you think we should have them, please reach out!")]]]
diff --git a/test/pronouns/pages_test.clj b/test/pronouns/pages_test.clj
new file mode 100644
index 0000000..04c14ce
--- /dev/null
+++ b/test/pronouns/pages_test.clj
@@ -0,0 +1,10 @@
+(ns pronouns.pages-test
+  (:require [pronouns.pages :as pages]
+            [midje.sweet :refer :all]))
+
+(fact "prose-comma-list turns a list of strings into a prose list with commas"
+      (pages/prose-comma-list ["foo"]) => "foo"
+      (pages/prose-comma-list ["foo" "bar"]) => "foo and bar"
+      (pages/prose-comma-list ["foo" "bar" "baz"]) => "foo, bar, and baz"
+      (pages/prose-comma-list ["foo" "bar" "baz" "bobble"]) => "foo, bar, baz, and bobble"
+      (pages/prose-comma-list []) => "")