Work arounds for CLJ-1062
This commit is contained in:
parent
cf86bd4ab6
commit
23a55420df
7 changed files with 15 additions and 13 deletions
|
|
@ -50,7 +50,7 @@
|
||||||
;; only clj-time/JodaTime available, used to test monger.joda-time w/o clojure.data.json
|
;; only clj-time/JodaTime available, used to test monger.joda-time w/o clojure.data.json
|
||||||
:dev2 {:resource-paths ["test/resources"]
|
:dev2 {:resource-paths ["test/resources"]
|
||||||
:dependencies [[clj-time "0.4.2" :exclusions [org.clojure/clojure]]]}}
|
: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"
|
:repositories {"sonatype" {:url "http://oss.sonatype.org/content/repositories/releases"
|
||||||
:snapshots false
|
:snapshots false
|
||||||
:releases {:checksum :fail :update :always}}
|
:releases {:checksum :fail :update :always}}
|
||||||
|
|
|
||||||
|
|
@ -227,3 +227,4 @@
|
||||||
|
|
||||||
(defoperator $ifNull)
|
(defoperator $ifNull)
|
||||||
(defoperator $cond)
|
(defoperator $cond)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
monger.testkit
|
monger.testkit
|
||||||
(:require [monger.collection :as mc]
|
(:require [monger.collection :as mc]
|
||||||
[monger.result :as mr])
|
[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))
|
(:import org.bson.types.ObjectId))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,10 +1,11 @@
|
||||||
(ns monger.test.factory-dsl-test
|
(ns monger.test.factory-dsl-test
|
||||||
(:use clojure.test
|
(:use clojure.test
|
||||||
[monger testkit joda-time]
|
[monger testkit]
|
||||||
monger.test.fixtures
|
monger.test.fixtures
|
||||||
[clj-time.core :only [days ago weeks now]])
|
[clj-time.core :only [days ago weeks now]])
|
||||||
(:require [monger.collection :as mc]
|
(:require [monger.collection :as mc]
|
||||||
[monger.test.helper :as helper])
|
[monger.test.helper :as helper]
|
||||||
|
monger.joda-time)
|
||||||
(:import org.bson.types.ObjectId
|
(:import org.bson.types.ObjectId
|
||||||
org.joda.time.DateTime))
|
org.joda.time.DateTime))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
[monger.core :only [count]]
|
[monger.core :only [count]]
|
||||||
monger.test.fixtures
|
monger.test.fixtures
|
||||||
[monger operators conversion]
|
[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]
|
(:require [monger.gridfs :as gridfs]
|
||||||
[monger.test.helper :as helper]
|
[monger.test.helper :as helper]
|
||||||
[clojure.java.io :as io])
|
[clojure.java.io :as io])
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,12 @@
|
||||||
(ns monger.test.lib-integration-test
|
(ns monger.test.lib-integration-test
|
||||||
(:use clojure.test
|
(:use clojure.test
|
||||||
monger.json
|
|
||||||
monger.joda-time
|
|
||||||
monger.conversion)
|
monger.conversion)
|
||||||
(:import [org.joda.time DateTime DateMidnight]
|
(:import [org.joda.time DateTime DateMidnight]
|
||||||
org.bson.types.ObjectId
|
org.bson.types.ObjectId
|
||||||
com.mongodb.DBObject)
|
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]))
|
[clj-time.core :as t]))
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
[monger.test.helper :as helper])
|
[monger.test.helper :as helper])
|
||||||
(:use clojure.test
|
(:use clojure.test
|
||||||
monger.test.fixtures
|
monger.test.fixtures
|
||||||
[monger conversion query operators joda-time]
|
[monger conversion query operators]
|
||||||
[clj-time.core :only [date-time]]))
|
[clj-time.core :only [date-time]]))
|
||||||
|
|
||||||
(helper/connect!)
|
(helper/connect!)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue