working on new release... got one cljs error to figure out

slagyr · Apr 7, 2016 · 4fe21a0 · 4fe21a0
1 parent 881497c
commit 4fe21a0
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,10 @@
+# 3.3.2
+
+* upgrade to clojure 1.8.0
+* upgrade clojurescript to 1.8.40
+* .cljc support by @eyelidlessness https://github.com/slagyr/speclj/pull/150
+* better platform support by @eyelidlessness https://github.com/slagyr/speclj/pull/152
+
 # 3.3.1
 
 * fixes reader conditionals in require form 

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject speclj "3.3.2-SNAPSHOT"
+(defproject speclj "3.3.2"
             :description "speclj: Pronounced 'speckle', is a Behavior Driven Development framework for Clojure."
             :url "http://speclj.com"
             :license {:name         "The MIT License"
@@ -13,12 +13,12 @@
             :test-paths ["spec" "dev"]
             :java-source-paths ["src"]
 
-            :dependencies [[org.clojure/clojure "1.7.0-RC2"]
+            :dependencies [[org.clojure/clojure "1.8.0"]
                            [fresh "1.1.2"]
                            [mmargs "1.2.0"]
                            [trptcolin/versioneer "0.1.1"]]
 
-            :profiles {:dev {:dependencies [[org.clojure/clojurescript "0.0-3308"]]
+            :profiles {:dev {:dependencies [[org.clojure/clojurescript "1.8.40"]]
                              :plugins      [[codox "0.8.11" :exclusions [org.clojure/clojure]]]}}
 
             :prep-tasks ["javac" "compile"]
@@ -27,6 +27,6 @@
                       "spec" ["do" "run" "-m" "speclj.dev.spec"]
                       "ci"   ["do" "spec," "cljs"]}
 
-            :codox {:src-dir-uri               "http://github.com/slagyr/speclj/blob/3.3.0/"
+            :codox {:src-dir-uri               "http://github.com/slagyr/speclj/blob/3.3.2/"
                     :src-linenum-anchor-prefix "L"}
             )
diff --git a/spec/speclj/platform_spec.cljc b/spec/speclj/platform_spec.cljc
@@ -6,7 +6,7 @@
     [speclj.run.standard :refer [run-specs]]))
 
 (defmacro which-env []
-  `(if-cljs :cljs :clj))
+  (if-cljs :cljs :clj))
 
 (describe "platform-specific bits"
   #?(:cljs

diff --git a/spec/speclj/should_spec.cljc b/spec/speclj/should_spec.cljc
@@ -355,7 +355,7 @@
              (failure-message (should-throw exception (+ 1 1))))
     #?(:cljs
        (should=
-         (str "Expected nothing thrown from: " (pr-str '(throw (-new-throwable "some message"))) endl "                     but got: #<some message>")
+         (str "Expected nothing thrown from: " (pr-str '(throw (-new-throwable "some message"))) endl "                     but got: #object[String some message]")
          (failure-message (should-not-throw (throw (-new-throwable "some message")))))
        :clj
        (should-contain
@@ -388,7 +388,7 @@
     (should-fail! (should-not-throw (throw (-new-throwable "error"))))
     #?(:cljs
        (should=
-         (str "Expected nothing thrown from: " (pr-str '(throw (-new-throwable "error"))) endl "                     but got: #<error>")
+         (str "Expected nothing thrown from: " (pr-str '(throw (-new-throwable "error"))) endl "                     but got: #object[String error]")
          (failure-message (should-not-throw (throw (-new-throwable "error")))))
        :clj
        (should-contain