diff --git a/project.clj b/project.clj index b95f17a..d28753e 100644 --- a/project.clj +++ b/project.clj @@ -50,7 +50,7 @@ ;; only clj-time/JodaTime available, used to test monger.joda-time w/o clojure.data.json :dev2 {:resource-paths ["test/resources"] :dependencies [[clj-time "0.4.2" :exclusions [org.clojure/clojure]]]}} - :aliases {"all" ["with-profile" "dev:dev,1.3"]} + :aliases {"all" ["with-profile" "dev:dev,1.3:dev,1.5"]} :repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases" :snapshots false :releases {:checksum :fail :update :always}} diff --git a/src/clojure/monger/operators.clj b/src/clojure/monger/operators.clj index c8fba34..61bd5ee 100644 --- a/src/clojure/monger/operators.clj +++ b/src/clojure/monger/operators.clj @@ -226,4 +226,5 @@ (defoperator $ifNull) -(defoperator $cond) \ No newline at end of file +(defoperator $cond) + diff --git a/src/clojure/monger/testkit.clj b/src/clojure/monger/testkit.clj index 8fbfbe2..dfdbaff 100644 --- a/src/clojure/monger/testkit.clj +++ b/src/clojure/monger/testkit.clj @@ -14,7 +14,7 @@ monger.testkit (:require [monger.collection :as mc] [monger.result :as mr]) - (:use [monger.internal.fn :only (expand-all expand-all-with) :as fntools]) + (:use [monger.internal.fn :only [expand-all expand-all-with]]) (:import org.bson.types.ObjectId)) diff --git a/test/monger/test/factory_dsl_test.clj b/test/monger/test/factory_dsl_test.clj index 5424584..4aa6b6f 100644 --- a/test/monger/test/factory_dsl_test.clj +++ b/test/monger/test/factory_dsl_test.clj @@ -1,10 +1,11 @@ (ns monger.test.factory-dsl-test - (:use clojure.test - [monger testkit joda-time] - monger.test.fixtures - [clj-time.core :only [days ago weeks now]]) + (:use clojure.test + [monger testkit] + monger.test.fixtures + [clj-time.core :only [days ago weeks now]]) (:require [monger.collection :as mc] - [monger.test.helper :as helper]) + [monger.test.helper :as helper] + monger.joda-time) (:import org.bson.types.ObjectId org.joda.time.DateTime)) diff --git a/test/monger/test/gridfs_test.clj b/test/monger/test/gridfs_test.clj index 97d0473..5f343d1 100644 --- a/test/monger/test/gridfs_test.clj +++ b/test/monger/test/gridfs_test.clj @@ -4,7 +4,7 @@ [monger.core :only [count]] monger.test.fixtures [monger operators conversion] - [monger.gridfs :only (store make-input-file store-file filename content-type metadata)]) + [monger.gridfs :only [store make-input-file store-file filename content-type metadata]]) (:require [monger.gridfs :as gridfs] [monger.test.helper :as helper] [clojure.java.io :as io]) diff --git a/test/monger/test/lib_integration_test.clj b/test/monger/test/lib_integration_test.clj index c402a47..a111991 100644 --- a/test/monger/test/lib_integration_test.clj +++ b/test/monger/test/lib_integration_test.clj @@ -1,12 +1,12 @@ (ns monger.test.lib-integration-test (:use clojure.test - monger.json - monger.joda-time monger.conversion) (:import [org.joda.time DateTime DateMidnight] org.bson.types.ObjectId com.mongodb.DBObject) - (:require [clojure.data.json :as json] + (:require monger.json + monger.joda-time + [clojure.data.json :as json] [clj-time.core :as t])) diff --git a/test/monger/test/querying_test.clj b/test/monger/test/querying_test.clj index d5cdebf..a94263c 100644 --- a/test/monger/test/querying_test.clj +++ b/test/monger/test/querying_test.clj @@ -11,7 +11,7 @@ [monger.test.helper :as helper]) (:use clojure.test monger.test.fixtures - [monger conversion query operators joda-time] + [monger conversion query operators] [clj-time.core :only [date-time]])) (helper/connect!)