From a393cd89e2b69580dbf17eac32dda8e96f4179bb Mon Sep 17 00:00:00 2001 From: Sean Corfield Date: Thu, 15 Jul 2021 19:26:59 -0700 Subject: [PATCH] fixes #337 by using clojure.test for cljs --- CHANGELOG.md | 3 ++- deps.edn | 2 +- test/honey/sql/helpers_test.cljc | 3 +-- test/honey/sql/postgres_test.cljc | 3 +-- test/honey/sql_test.cljc | 3 +-- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b2d70c..a84e013 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Changes -* 2.0.next in progress +* 2.0.next in progress (2.x will be VGN only) + * Fix #337 by switching to `clojure.test` even for ClojureScript. * Address #330 by improving exception when a non-entity is encountered where an entity is expected. * Fix bug in unrolling nested argument to `with-columns` helper. diff --git a/deps.edn b/deps.edn index c65a077..bcd36a1 100644 --- a/deps.edn +++ b/deps.edn @@ -17,7 +17,7 @@ :main-opts ["-m" "seancorfield.readme"]} :eastwood {:extra-deps {jonase/eastwood {:mvn/version "0.5.1"}} :main-opts ["-m" "eastwood.lint" "{:source-paths,[\"src\"]}"]} - :jar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.0.216"}} + :jar {:replace-deps {com.github.seancorfield/depstar {:mvn/version "2.1.267"}} :exec-fn hf.depstar/jar :exec-args {:jar "honeysql.jar" :sync-pom true}} :install {:replace-deps {slipset/deps-deploy {:mvn/version "0.1.5"}} diff --git a/test/honey/sql/helpers_test.cljc b/test/honey/sql/helpers_test.cljc index 33ea68c..76fa2f8 100644 --- a/test/honey/sql/helpers_test.cljc +++ b/test/honey/sql/helpers_test.cljc @@ -2,8 +2,7 @@ (ns honey.sql.helpers-test (:refer-clojure :exclude [filter for group-by partition-by set update]) - (:require #?(:clj [clojure.test :refer [deftest is testing]] - :cljs [cljs.test :refer-macros [deftest is testing]]) + (:require [clojure.test :refer [deftest is testing]] [honey.sql :as sql] [honey.sql.helpers :as h :refer [add-column add-index alter-table columns create-table create-table-as create-view diff --git a/test/honey/sql/postgres_test.cljc b/test/honey/sql/postgres_test.cljc index ad17359..ccbcb51 100644 --- a/test/honey/sql/postgres_test.cljc +++ b/test/honey/sql/postgres_test.cljc @@ -9,8 +9,7 @@ (ns honey.sql.postgres-test (:refer-clojure :exclude [update partition-by set]) - (:require #?(:clj [clojure.test :refer [deftest is testing]] - :cljs [cljs.test :refer-macros [deftest is testing]]) + (:require [clojure.test :refer [deftest is testing]] ;; pull in all the PostgreSQL helpers that the nilenso ;; library provided (as well as the regular HoneySQL ones): [honey.sql.helpers :as sqlh :refer diff --git a/test/honey/sql_test.cljc b/test/honey/sql_test.cljc index ae2109a..d4b635d 100644 --- a/test/honey/sql_test.cljc +++ b/test/honey/sql_test.cljc @@ -3,8 +3,7 @@ (ns honey.sql-test (:refer-clojure :exclude [format]) (:require [clojure.string :as str] - #?(:clj [clojure.test :refer [deftest is testing]] - :cljs [cljs.test :refer-macros [deftest is testing]]) + [clojure.test :refer [deftest is testing]] [honey.sql :as sut :refer [format]] [honey.sql.helpers :as h]) #?(:clj (:import (clojure.lang ExceptionInfo))))