More tests

src/klipse/cards/test/clojure-deps.cljs

@@ -0,0 +1,51 @@
+(ns klipse.cards.test.clojure-deps
+ (:require-macros 
+ [cljs.core.async.macros :refer [go]]
+ [cljs.test :refer [is are async]])
+ (:require 
+ [cljs.core.async :refer [<!]]
+ [clojure.string :as string]
+ [klipse.lang.clojure :refer [eval result-as-str]]
+ [devcards.core :as dc :refer-macros [defcard deftest]]))
+
+(set! klipse.utils/verbose? (constantly true))
+(defn remove-chars [s]
+ (if (string? s)
+ (string/replace s #"\n|\s" "")
+ s))
+
+(defn a= [& args]
+ (apply = (map remove-chars args)))
+
+(defn b= [[status-a a] [status-b b]]
+ (and (= status-a status-b)
+ (a= a b)))
+
+
+(deftest clj-bundled-success
+ "require clj bundled packages"
+ (async done
+ (go (are [input res]
+ (b= (<! (eval input)) [:ok res])
+ "(require 'clojure.set)" nil)
+ (done))))
+
+(deftest cljsjs-error
+ "require cljsjs packages that don't exist"
+ (async done
+ (go
+ (are [input-clj]
+ (= :error (first (<! (eval input-clj))))
+ "(require 'cljsjs.no-package)"
+ )
+ (done))))
+
+(deftest cljsjs-success
+ "require cljsjs packages that exist"
+ (async done
+ (go (are [input res]
+ (b= (<! (eval input)) [:ok res])
+ "(require 'cljsjs.moment)" nil
+ "(require 'cljsjs.moment) (nil? js/Moment)" false)
+ (done))))
+

src/klipse/lang/clojure.cljs

@@ -85,7 +85,7 @@
 ; store the original compiler/emits - as I'm afraif things might get wrong with all the with-redefs (especially with core.async. See http://dev.clojure.org/jira/browse/CLJS-1634
 (def original-emits compiler/emits)
 
-(defn core-compile-an-exp [s {:keys [static-fns external-libs max-eval-duration compile-display-guard] :or {static-fns false external-libs nil max-eval-duration min-max-eval-duration compile-display-guard false}}]
+(defn core-compile-an-exp [s {:keys [static-fns external-libs max-eval-duration compile-display-guard verbose] :or {verbose (verbose?) static-fns false external-libs nil max-eval-duration min-max-eval-duration compile-display-guard false}}]
  (let [c (chan)
  max-eval-duration (max max-eval-duration min-max-eval-duration)
  the-emits (if compile-display-guard (partial my-emits max-eval-duration) original-emits)]
@@ -97,15 +97,15 @@
  :ns @current-ns
  :static-fns static-fns
  :*compiler* (set! env/*compiler* (create-state-eval))
- :verbose (verbose?)
+ :verbose verbose
  :load (partial io/load-ns external-libs)
  }
  (fn [res]
  (update-current-ns res)
  (put! c res))))
  c))
 
-(defn core-eval-an-exp [s {:keys [static-fns external-libs max-eval-duration] :or {static-fns false external-libs nil max-eval-duration min-max-eval-duration}}]
+(defn core-eval-an-exp [s {:keys [static-fns external-libs max-eval-duration verbose] :or {static-fns false external-libs nil max-eval-duration min-max-eval-duration verbose (verbose?)}}]
  (let [c (chan)
  max-eval-duration (max max-eval-duration min-max-eval-duration)]
  (with-redefs [compiler/emits (partial my-emits max-eval-duration)]
@@ -116,7 +116,7 @@
  {:eval my-eval
  :ns @current-ns
  :def-emits-var true
- :verbose (verbose?)
+ :verbose false;verbose
  :*compiler* (set! env/*compiler* (create-state-eval))
  :context :expr
  :static-fns static-fns

src/klipse/lang/clojure/io.cljs

@@ -97,6 +97,7 @@
  (when (seq filenames)
  (let [filename (first filenames)
  {:keys [status body]} (<! (http/get (filename-of filename (cache-buster?)) {:with-credentials? false}))]
+ (js/console.info "status" status "body" body)
  (if (= 200 status)
  (do (src-cb {:lang lang src-key (transform body) :file filename})
  :success)

test/cljs/test/runner.cljs

@@ -2,7 +2,9 @@
  (:require
  [doo.runner :refer-macros [doo-tests]]
  [klipse.cards.test.eval]
+ [klipse.cards.test.clojure-deps]
  [klipse.cards.test.compile]))
 
 (doo-tests 'klipse.cards.test.eval
+ 'klipse.cards.test.clojure-deps
  'klipse.cards.test.compile)