From 5eda9a8cddef18bbdec65f1ade2f2c7c09f9bfae Mon Sep 17 00:00:00 2001 From: eyelidlessness Date: Tue, 5 Jan 2016 15:03:33 -0800 Subject: [PATCH] Support CLJC Eliminates the discrepancy between Clojure and ClojureScript classes for speclj.platform.SpecFailure and speclj.platform.SpecPending --- project.clj | 2 +- src/speclj/core.clj | 4 ++-- src/speclj/platform.clj | 4 ++-- src/speclj/{ => platform}/SpecFailure.java | 2 +- src/speclj/{ => platform}/SpecPending.java | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) rename src/speclj/{ => platform}/SpecFailure.java (87%) rename src/speclj/{ => platform}/SpecPending.java (80%) diff --git a/project.clj b/project.clj index f95cbc7..9546923 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject speclj "3.3.1" +(defproject speclj "3.3.2-SNAPSHOT" :description "speclj: Pronounced 'speckle', is a Behavior Driven Development framework for Clojure." :url "http://speclj.com" :license {:name "The MIT License" diff --git a/src/speclj/core.clj b/src/speclj/core.clj index 2a7f1da..063c84f 100644 --- a/src/speclj/core.clj +++ b/src/speclj/core.clj @@ -18,10 +18,10 @@ ([message] (if cljs? `(js/Object. ~message) `(java.lang.Throwable. ~message)))) (defmacro ^:no-doc -new-failure [message] - (if cljs? `(speclj.platform.SpecFailure. ~message) `(speclj.SpecFailure. ~message))) + `(speclj.platform.SpecFailure. ~message)) (defmacro ^:no-doc -new-pending [message] - (if cljs? `(speclj.platform.SpecPending. ~message) `(speclj.SpecPending. ~message))) + `(speclj.platform.SpecPending. ~message)) (defmacro it "body => any forms but aught to contain at least one assertion (should) diff --git a/src/speclj/platform.clj b/src/speclj/platform.clj index 16b8283..d6f4994 100644 --- a/src/speclj/platform.clj +++ b/src/speclj/platform.clj @@ -9,8 +9,8 @@ (def throwable Throwable) (def exception java.lang.Exception) -(def failure speclj.SpecFailure) -(def pending speclj.SpecPending) +(def failure speclj.platform.SpecFailure) +(def pending speclj.platform.SpecPending) (defn pending? [e] (isa? (type e) pending)) (defn failure? [e] (isa? (type e) failure)) diff --git a/src/speclj/SpecFailure.java b/src/speclj/platform/SpecFailure.java similarity index 87% rename from src/speclj/SpecFailure.java rename to src/speclj/platform/SpecFailure.java index c9e3302..c4e52c6 100644 --- a/src/speclj/SpecFailure.java +++ b/src/speclj/platform/SpecFailure.java @@ -1,4 +1,4 @@ -package speclj; +package speclj.platform; public class SpecFailure extends Exception { diff --git a/src/speclj/SpecPending.java b/src/speclj/platform/SpecPending.java similarity index 80% rename from src/speclj/SpecPending.java rename to src/speclj/platform/SpecPending.java index 99b4f42..66acc07 100644 --- a/src/speclj/SpecPending.java +++ b/src/speclj/platform/SpecPending.java @@ -1,4 +1,4 @@ -package speclj; +package speclj.platform; public class SpecPending extends Exception {