Skip to content

Commit

Permalink
ci task works
Browse files Browse the repository at this point in the history
  • Loading branch information
slagyr committed Mar 10, 2014
1 parent 3ceb7f8 commit 33c923f
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 20 deletions.
4 changes: 4 additions & 0 deletions CHANGES.md
@@ -1,3 +1,7 @@
# 3.0.2

* Fixes 'ClassNotFoundException speclj.run.standard' when running Vigilant.

# 3.0.1

* Fixes exception throwing so that correct line numbers are displayed
Expand Down
3 changes: 0 additions & 3 deletions project.clj
Expand Up @@ -34,7 +34,6 @@
:java-source-paths ["src/clj"]

:profiles {:dev {:dependencies [[com.keminglabs/cljx "0.3.2"]
;[org.clojure/clojurescript "0.0-2014"]]
[org.clojure/clojurescript "0.0-2173"]]
:plugins [[com.keminglabs/cljx "0.3.2"]
[lein-cljsbuild "1.0.1"]]}}
Expand All @@ -50,6 +49,4 @@
"ci" ["do" "clean," "javac," "spec," "cljsbuild" "once" "dev"]}

:eval-in :leiningen ; to recognize spec task
:speclj-eval-in :leiningen ; to make tests faster

)
3 changes: 2 additions & 1 deletion spec/cljx/speclj/config_spec.cljx
Expand Up @@ -23,7 +23,8 @@
;<-cljs-ignore

(it "throws exception with unrecognized runner"
(should-throw platform/exception "Failed to load runner: blah" (load-runner "blah")))
(should-throw platform/exception "Failed to load runner: blah" (load-runner "blah"))
)

(it "dynamically loads ProgressReporter"
(let [reporter (load-reporter "progress")]
Expand Down
17 changes: 1 addition & 16 deletions src/clj/speclj/core.clj
Expand Up @@ -5,11 +5,7 @@

(def ^:private cljs? (boolean (find-ns 'cljs.analyzer)))

; Disable CLJS :invalid-arithmetic warnings... They popup when ever should== is used.
;(.println System/out "HERE!!!")
;(when cljs? (set! cljs.analyzer/*cljs-warnings* (dissoc cljs.analyzer/*cljs-warnings* :invalid-arithmetic)))
;(println "cljs.analyzer/*cljs-warnings*: " cljs.analyzer/*cljs-warnings*)
;(.println System/out (:invalid-arithmetic cljs.analyzer/*cljs-warnings*))
(println "cljs?: " cljs?)

(defmacro -new-exception
([] (if cljs? `(js/Error.) `(java.lang.Exception.)))
Expand Down Expand Up @@ -553,17 +549,6 @@ When a string is also passed, it asserts that the message of the Exception is eq
(and (bound? #'*bound-by-should-invoke*)
*bound-by-should-invoke*)))

;(declare ^:dynamic *bound-by-should-invoke*)

;#+clj
;(defn- bound-by-should-invoke? []
; (and (bound? #'*bound-by-should-invoke*)
; *bound-by-should-invoke*))

;#+cljs
;(defn- bound-by-should-invoke? []
; *bound-by-should-invoke*)

(defmacro with-stubbed-invocations [& body]
`(if (not (speclj.platform/bound-by-should-invoke?))
(binding [speclj.stub/*stubbed-invocations* (atom [])
Expand Down

0 comments on commit 33c923f

Please sign in to comment.