From aeb86ab396e6b3b4f7e20121813d40a27830db8f Mon Sep 17 00:00:00 2001 From: Nathan Marz Date: Tue, 30 Jun 2015 17:38:57 -0400 Subject: [PATCH] fix namespace definitions for cljs tests but tests still don't run in cljs --- test/com/rpl/specter/core_test.cljc | 25 ++++++++++++++++--------- test/com/rpl/specter/test_helpers.clj | 6 ------ 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/test/com/rpl/specter/core_test.cljc b/test/com/rpl/specter/core_test.cljc index 3b5e048..2a5d110 100644 --- a/test/com/rpl/specter/core_test.cljc +++ b/test/com/rpl/specter/core_test.cljc @@ -1,23 +1,30 @@ (ns com.rpl.specter.core-test #?(:cljs (:require-macros - [cljs.test :refer (is deftest)] - [cljs.test.check.cljs-test :refer (defspec)])) + [cljs.test :refer [is deftest]] + [cljs.test.check.cljs-test :refer [defspec]] + [com.rpl.specter.test-helpers :refer [for-all+]])) (:use #?(:clj [clojure.test :only [deftest is]]) #?(:clj [clojure.test.check.clojure-test :only [defspec]]) - [com.rpl.specter.protocols :only [comp-paths*]] - [com.rpl.specter.test-helpers :only [limit-size for-all+]]) - (:require [clojure.test.check - [generators :as gen] - [properties :as prop #?@(:cljs [:include-macros true])]] - [com.rpl [specter :as s]] - [clojure.test.check :as qc])) + #?(:clj [com.rpl.specter.test-helpers :only [for-all+]]) + [com.rpl.specter.protocols :only [comp-paths*]]) + (:require #?@(:clj [[clojure.test.check.generators :as gen] + [clojure.test.check.properties :as prop]] + :cljs [[cljs.test.check.generators :as gen] + [cljs.test.check.properties :as prop]] + ) + [com.rpl.specter :as s])) ;;TODO: ;; test walk, codewalk ;; test keypath ;; test comp-structure-paths +(defn limit-size [n {gen :gen}] + (gen/->Generator + (fn [rnd _size] + (gen rnd (if (< _size n) _size n))))) + (defn gen-map-with-keys [key-gen val-gen & keys] (gen/bind (gen/map key-gen val-gen) (fn [m] diff --git a/test/com/rpl/specter/test_helpers.clj b/test/com/rpl/specter/test_helpers.clj index fa9a624..3a52d27 100644 --- a/test/com/rpl/specter/test_helpers.clj +++ b/test/com/rpl/specter/test_helpers.clj @@ -19,9 +19,3 @@ (reverse parts))] `(prop/for-all [~vars ~genned] ~@body ))) - -(defn limit-size [n {gen :gen}] - (gen/->Generator - (fn [rnd _size] - (gen rnd (if (< _size n) _size n))))) -