Skip to content

Commit

Permalink
use midje for testing per #57
Browse files Browse the repository at this point in the history
  • Loading branch information
morganastra committed Sep 24, 2016
1 parent cf48e33 commit 349a4a2
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
3 changes: 2 additions & 1 deletion project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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})
8 changes: 4 additions & 4 deletions src/pronouns/pages.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)))))

Expand Down Expand Up @@ -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)]])))

Expand All @@ -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:"]
Expand All @@ -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!")]]]
Expand Down
10 changes: 10 additions & 0 deletions test/pronouns/pages_test.clj
Original file line number Diff line number Diff line change
@@ -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 []) => "")

0 comments on commit 349a4a2

Please sign in to comment.