Permalink
Browse files

Removed clojure.contrib dev dependency

  • Loading branch information...
1 parent 30c1f1b commit 0acd002bfd0edf21abfe6b6efbfa4d9949dea6e6 @weavejester committed Jul 13, 2012
Showing with 5 additions and 8 deletions.
  1. +1 −2 project.clj
  2. +4 −6 test/compojure/test/core.clj
View
@@ -7,5 +7,4 @@
[clout "1.0.1"]
[ring/ring-core "1.1.0"]]
:profiles
- {:dev {:dependencies [[ring-mock "0.1.1"]
- [org.clojure/clojure-contrib "1.2.0"]]}})
+ {:dev {:dependencies [[ring-mock "0.1.1"]]}})
@@ -1,8 +1,6 @@
(ns compojure.test.core
(:use clojure.test
ring.mock.request
- clojure.contrib.mock.test-adapter
- clojure.contrib.with-ns
compojure.core
compojure.response
clout.core)
@@ -67,10 +65,10 @@
(assoc resp :body nil)))))
(testing "custom regular expressions"
- (expect [route-compile
- (has-args ["/foo/:id" {:id "[0-9]+"}]
- (times 1))]
- (eval `(GET ["/foo/:id" :id "[0-9]+"] [])))))
+ (let [route (GET ["/foo/:id" :id #"\d+"] [id] id)]
+ (is (nil? (route (request :get "/foo/bar"))))
+ (is (nil? (route (request :get "/foo/1.1"))))
+ (is (route (request :get "/foo/10"))))))
(deftest routing-test
(routing (request :get "/bar")

0 comments on commit 0acd002

Please sign in to comment.