Permalink
Browse files

upgrades clojures

  • Loading branch information...
1 parent a108447 commit 2e9b6ca7ed6283e04cacf7bdd9fd18d7e3435d7b @slagyr committed Jun 18, 2014
Showing with 15 additions and 4 deletions.
  1. +2 −0 CHANGES.md
  2. +3 −3 project.clj
  3. +10 −1 spec/cljx/speclj/should_spec.cljx
View
@@ -1,5 +1,7 @@
# 3.1.0
+* upgrade to clojure 1.6
+* upgrade clojurescript to 0.0-2234 and cljsbuild to 1.0.3
* should-throw matches regex. @TakaGoto https://github.com/slagyr/speclj/pull/95
* `lein spec` no longer hangs when exiting if agents were used. @sdegutis https://github.com/slagyr/issues/pull/94
* Fix for inproper exit-code on spec failures. @CraZySacX https://github.com/slagyr/speclj/pull/90
View
@@ -14,7 +14,7 @@
:test-paths ["spec/clj" "target/test-classes"]
:hooks [cljx.hooks]
- :dependencies [[org.clojure/clojure "1.5.1"]
+ :dependencies [[org.clojure/clojure "1.6.0"]
[fresh "1.0.2"]
[mmargs "1.2.0"]]
@@ -34,9 +34,9 @@
:java-source-paths ["src/clj"]
:profiles {:dev {:dependencies [[com.keminglabs/cljx "0.3.2"]
- [org.clojure/clojurescript "0.0-2173"]]
+ [org.clojure/clojurescript "0.0-2234"]]
:plugins [[com.keminglabs/cljx "0.3.2"]
- [lein-cljsbuild "1.0.1"]]}}
+ [lein-cljsbuild "1.0.3"]]}}
:cljsbuild {:builds {:dev {:source-paths ["target/classes" "src/cljs" "target/test-classes" "spec/cljs"]
:compiler {:output-to "target/tests.js"
@@ -187,7 +187,16 @@
(it "checks equality of maps"
(should-pass! (should== {:a 1} {:a 1}))
(should-fail! (should== {:a 1} {:a 1 :b 2}))
- (should= (str "Expected contents: {:a 1}" endl " got: {:a 1, :b 2}" endl " missing: nil" endl " extra: {:b 2}") (failure-message (should== {:a 1} {:a 1 :b 2}))))
+ (let [lines (.split (failure-message (should== {:a 1} {:a 1 :b 2})) endl)]
+ (should= "Expected contents: {:a 1}" (aget lines 0))
+ (should-contain ":b 2" (aget lines 1))
+ (should-contain ":a 1" (aget lines 1))
+ (should= " missing: nil" (aget lines 2))
+ (should= " extra: {:b 2}" (aget lines 3))
+ )
+; (should= (str "Expected contents: {:a 1}" endl " got: {:b 2, :a 1}" endl " missing: nil" endl " extra: {:b 2}")
+; (failure-message (should== {:a 1} {:a 1 :b 2})))
+ )
))

0 comments on commit 2e9b6ca

Please sign in to comment.