diff --git a/test/NoteHub/test/crossover/lib.clj b/test/NoteHub/test/crossover/lib.clj
deleted file mode 100644
index b906dd6..0000000
--- a/test/NoteHub/test/crossover/lib.clj
+++ /dev/null
@@ -1,16 +0,0 @@
-(ns NoteHub.test.crossover.lib
- (:require [NoteHub.crossover.lib :as lib])
- (:use [clojure.test]))
-
-(with-test
- (defn lib-hash [s]
- (lib/hash #(.codePointAt % 0) s))
- (testing "Crossover Lib:"
- (testing "Self-made hash function"
- (testing "for correct hashes"
- (is (= 0 (lib-hash "")))
- (is (= 6178 (lib-hash "test тест")))
- (is (= 6178 (lib-hash (str "test\n \rтест"))))
- (is (= 274 (lib-hash "Hello world!"))))
- (testing "for a wrong hash"
- (is (not= 6178 (lib-hash "wrong hash")))))))
diff --git a/test/NoteHub/test/views/pages.clj b/test/NoteHub/test/views/pages.clj
index fbf8b4f..be36b2b 100644
--- a/test/NoteHub/test/views/pages.clj
+++ b/test/NoteHub/test/views/pages.clj
@@ -1,5 +1,4 @@
(ns NoteHub.test.views.pages
- (:require [NoteHub.crossover.lib :as lib])
(:use [NoteHub.views.pages]
[noir.util.test]
[NoteHub.views.common :only [url]]
@@ -23,88 +22,92 @@
(is (= (url 2010 05 06 "test-title" "export") "/2010/5/6/test-title/export"))
(deftest testing-fixture
- (testing "Was a not created?"
- (is (= (get-note date test-title) test-note))
- (is (note-exists? date test-title))))
+ (testing "Was a not created?"
+ (is (= (get-note date test-title) test-note))
+ (is (note-exists? date test-title))))
-(deftest helper-functions
- (testing "Markdown generation"
- (is (= "hellö world
test code
"
- (md-to-html "#_hellö_ __world__\ntest `code`")))))
(deftest export-test
- (testing "Markdown export"
- (is (has-body (send-request (url 2012 6 3 "some-title" "export")) test-note))))
+ (testing "Markdown export"
+ (is (has-body (send-request (url 2012 6 3 "some-title" "export")) test-note))))
(deftest note-creation
- (let [session-key (create-session)
- date (get-date)
- title "this-is-a-test-note"
- [year month day] date]
- (testing "Note creation"
- (is (has-status
- (send-request
- [:post "/post-note"]
- {:session-key session-key
- :draft test-note
- :session-value (str (lib/hash #(.codePointAt % 0)
- (str test-note session-key)))}) 302))
- (is (note-exists? date title))
- (is (substring? "Hello world"
- ((send-request (url year month day title)) :body)))
- (is (do
- (delete-note date title)
- (not (note-exists? date title)))))))
+ (let [session-key (create-session)
+ date (get-date)
+ title "this-is-a-test-note"
+ [year month day] date]
+ (testing "Note creation"
+ (is (has-status
+ (send-request
+ [:post "/post-note"]
+ {:session-key session-key
+ :draft test-note
+ :session-value (str (get-hash (str test-note session-key)))}) 302))
+ (is (note-exists? date title))
+ (is (substring? "Hello _world_"
+ ((send-request (url year month day title)) :body)))
+ (is (do
+ (delete-note date title)
+ (not (note-exists? date title)))))))
(deftest note-update
- (let [session-key (create-session)
- date (get-date)
- title "test-note"
- [year month day] date]
- (testing "Note update"
- (is (has-status
- (send-request
- [:post "/post-note"]
- {:session-key session-key
- :draft "test note"
- :password "qwerty"
- :session-value (str (lib/hash #(.codePointAt % 0)
- (str "test note" session-key)))}) 302))
- (is (note-exists? date title))
- (is (substring? "test note"
- ((send-request (url year month day title)) :body)))
- (is (has-status
- (send-request
- [:post "/update-note"]
- {:key (build-key [year month day] title)
- :draft "WRONG pass"
- :password "qwerty1" }) 403))
- (is (substring? "test note"
- ((send-request (url year month day title)) :body)))
- (is (has-status
- (send-request
- [:post "/update-note"]
- {:key (build-key [year month day] title)
- :draft "UPDATED CONTENT"
- :password "qwerty" }) 302))
- (is (substring? "UPDATED CONTENT"
- ((send-request (url year month day title)) :body)))
- (is (do
- (delete-note date title)
- (not (note-exists? date title)))))))
+ (let [session-key (create-session)
+ date (get-date)
+ title "test-note"
+ [year month day] date]
+ (testing "Note update"
+ (is (has-status
+ (send-request
+ [:post "/post-note"]
+ {:session-key session-key
+ :draft "test note"
+ :password "qwerty"
+ :session-value (str (get-hash (str "test note" session-key)))}) 302))
+ (is (note-exists? date title))
+ (is (substring? "test note"
+ ((send-request (url year month day title)) :body)))
+ (is (has-status
+ (send-request
+ [:post "/update-note"]
+ {:key (build-key [year month day] title)
+ :draft "WRONG pass"
+ :password "qwerty1" }) 403))
+ (is (substring? "test note"
+ ((send-request (url year month day title)) :body)))
+ (is (has-status
+ (send-request
+ [:post "/update-note"]
+ {:key (build-key [year month day] title)
+ :draft "UPDATED CONTENT"
+ :password "qwerty" }) 302))
+ (is (substring? "UPDATED CONTENT"
+ ((send-request (url year month day title)) :body)))
+ (is (do
+ (delete-note date title)
+ (not (note-exists? date title)))))))
(deftest requests
- (testing "HTTP Status"
- (testing "of a wrong access"
- (is (has-status (send-request "/wrong-page") 404))
- (is (has-status (send-request (url 2012 6 3 "lol" "stat")) 404))
- (is (has-status (send-request (url 2012 6 3 "lol" "export")) 404))
- (is (has-status (send-request (url 2012 6 3 "lol")) 404))
- (is (has-status (send-request (url 2012 6 4 "wrong-title")) 404)))
- (testing "of corrupt note-post"
- (is (has-status (send-request [:post "/post-note"]) 400)))
- (testing "valid accesses"
- ;(is (has-status (send-request "/new") 200) "accessing /new")
- (is (has-status (send-request (url 2012 6 3 "some-title")) 200) "accessing test note")
- (is (has-status (send-request (url 2012 6 3 "some-title" "export")) 200) "accessing test note's export")
- (is (has-status (send-request (url 2012 6 3 "some-title" "stats")) 200) "accessing test note's stats")
- (is (has-status (send-request "/") 200) "accessing landing page"))))
+ (testing "HTTP Status"
+ (testing "of a wrong access"
+ (is (has-status (send-request "/wrong-page") 404))
+ (is (has-status (send-request (url 2012 6 3 "lol" "stat")) 404))
+ (is (has-status (send-request (url 2012 6 3 "lol" "export")) 404))
+ (is (has-status (send-request (url 2012 6 3 "lol")) 404))
+ (is (has-status (send-request (url 2012 6 4 "wrong-title")) 404)))
+ (testing "of corrupt note-post"
+ (is (has-status (send-request [:post "/post-note"]) 400)))
+ (testing "valid accesses"
+ ;(is (has-status (send-request "/new") 200) "accessing /new")
+ (is (has-status (send-request (url 2012 6 3 "some-title")) 200) "accessing test note")
+ (is (has-status (send-request (url 2012 6 3 "some-title" "export")) 200) "accessing test note's export")
+ (is (has-status (send-request (url 2012 6 3 "some-title" "stats")) 200) "accessing test note's stats")
+ (is (has-status (send-request "/") 200) "accessing landing page"))))
+
+(deftest hash-function
+ (testing "Self-made hash function"
+ (testing "for correct hashes"
+ (is (= 0 (get-hash "")))
+ (is (= 6178 (get-hash "test тест")))
+ (is (= 6178 (get-hash (str "test\n \rтест"))))
+ (is (= 274 (get-hash "Hello world!"))))
+ (testing "for a wrong hash"
+ (is (not= 6178 (get-hash "wrong hash"))))))