uses speclj 3.0.0

8thlight · Feb 26, 2014 · b7adf35 · b7adf35
1 parent 9a5a9af
commit b7adf35
Show file tree

Hide file tree

Showing 15 changed files with 33 additions and 33 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,7 @@
+# 1.3.0
+
+* uses speclj 3.0.0
+
 # 1.2.2
 
 * relaxes mouse event capture on modal so that popups (file pickers, date pickers, etc) work as expected

diff --git a/bin/specljs b/bin/specljs
@@ -11,8 +11,8 @@ p.onConsoleMessage = function (x) {
 p.injectJs(phantom.args[0]);
 
 var result = p.evaluate(function () {
-  specljs.run.standard.armed = true;
+  speclj.run.standard.armed = true;
-  return specljs.run.standard.run_specs(
+  return speclj.run.standard.run_specs(
      cljs.core.keyword("color"), true
   );
 });

diff --git a/example/bin/specljs b/example/bin/specljs
@@ -11,8 +11,8 @@ p.onConsoleMessage = function (x) {
 p.injectJs(phantom.args[0]);
 
 var result = p.evaluate(function () {
-  specljs.run.standard.armed = true;
+  speclj.run.standard.armed = true;
-  return specljs.run.standard.run_specs(
+  return speclj.run.standard.run_specs(
      cljs.core.keyword("color"), true
   );
 });

diff --git a/example/project.clj b/example/project.clj
@@ -8,10 +8,8 @@
                  [org.clojure/clojure "1.5.1"]]
 
   :profiles {:dev {:dependencies [[org.clojure/clojurescript "0.0-2014"]
-                                  [speclj "2.9.1"]
+                                  [speclj "3.0.0"]]}}
-                                  [specljs "2.9.1"]]}}
+  :plugins [[speclj "3.0.0"]
-  :plugins [[speclj "2.9.1"]
-            [specljs "2.9.1"]
             [lein-cljsbuild "1.0.0"]]
 
   :cljsbuild ~(let [run-specs ["bin/specljs" "js/example_dev.js"]]

diff --git a/example/spec/cljs/example/main_spec.cljs b/example/spec/cljs/example/main_spec.cljs
@@ -1,6 +1,6 @@
 (ns example.main-spec
-  (:require-macros [specljs.core :refer [describe it should=]])
+  (:require-macros [speclj.core :refer [describe it should=]])
-  (:require [specljs.core]
+  (:require [speclj.core]
             [example.main]))
 
 (describe "A ClojureScript test"

diff --git a/project.clj b/project.clj
@@ -1,4 +1,4 @@
-(defproject com.8thlight/filament "1.2.2"
+(defproject com.8thlight/filament "1.3.0"
   :description "Rich client utilities"
   :url "http://github.com/8thlight/filament"
   :license {:name "Eclipse Public License"
@@ -11,10 +11,8 @@
                  ]
 
   :profiles {:dev {:dependencies [[org.clojure/clojurescript "0.0-2014"]
-                                  [speclj "2.9.1"]
+                                  [speclj "3.0.0"]]}}
-                                  [specljs "2.9.1"]]}}
+  :plugins [[speclj "3.0.0"]
-  :plugins [[speclj "2.9.1"]
-            [specljs "2.9.1"]
             [lein-cljsbuild "1.0.0"]]
 
   :cljsbuild ~(let [run-specs ["bin/specljs" "js/filament.js"]]

diff --git a/spec/cljs/com/eighthlight/filament/autocomplete_field_spec.cljs b/spec/cljs/com/eighthlight/filament/autocomplete_field_spec.cljs
@@ -1,6 +1,6 @@
 (ns com.eighthlight.filament.autocomplete-field-spec
   (:require-macros [hiccup.core :as h]
-                   [specljs.core :refer [describe context it should= should-contain with before around should-invoke should-not-invoke]])
+                   [speclj.core :refer [describe context it should= should-contain with before around should-invoke should-not-invoke]])
   (:require [com.eighthlight.filament.async :as async]
             [com.eighthlight.filament.autocomplete-field :as ac]
             [com.eighthlight.filament.fx :as fx]
@@ -10,7 +10,7 @@
             [domina.css :as css]
             [domina.events :as event]
             [hiccup.core]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Autocomplete Field"
 

diff --git a/spec/cljs/com/eighthlight/filament/collapsable_spec.cljs b/spec/cljs/com/eighthlight/filament/collapsable_spec.cljs
@@ -1,12 +1,12 @@
 (ns com.eighthlight.filament.collapsable-spec
-  (:require-macros [specljs.core :refer [describe it should= with before around]])
+  (:require-macros [speclj.core :refer [describe it should= with before around]])
   (:require [com.eighthlight.filament.spec-helper :as helper]
             [com.eighthlight.filament.collapsable :as c]
             [com.eighthlight.filament.fx :as fx]
             [domina :as dom]
             [domina.css :as css]
             [domina.events :as event]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Collapsable"
 

diff --git a/spec/cljs/com/eighthlight/filament/flash_spec.cljs b/spec/cljs/com/eighthlight/filament/flash_spec.cljs
@@ -1,12 +1,12 @@
 (ns com.eighthlight.filament.flash-spec
   (:require-macros [hiccup.core :as h]
-                   [specljs.core :refer [describe context it should= should-not= with before around should-contain should-not-contain]])
+                   [speclj.core :refer [describe context it should= should-not= with before around should-contain should-not-contain]])
   (:require [com.eighthlight.filament.flash :as flash]
             [com.eighthlight.filament.spec-helper :as helper]
             [domina :as dom]
             [domina.css :as css]
             [hiccup.core]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Flash"
 

diff --git a/spec/cljs/com/eighthlight/filament/forms_spec.cljs b/spec/cljs/com/eighthlight/filament/forms_spec.cljs
@@ -1,12 +1,12 @@
 (ns com.eighthlight.filament.forms-spec
   (:require-macros [hiccup.core :as h]
-                   [specljs.core :refer [describe context it should= with before around should-contain should-not-contain]])
+                   [speclj.core :refer [describe context it should= with before around should-contain should-not-contain]])
   (:require [com.eighthlight.filament.forms :as forms]
             [com.eighthlight.filament.spec-helper :as helper]
             [domina :as dom]
             [domina.css :as css]
             [hiccup.core]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Forms"
 

diff --git a/spec/cljs/com/eighthlight/filament/fx_spec.cljs b/spec/cljs/com/eighthlight/filament/fx_spec.cljs
@@ -1,12 +1,12 @@
 (ns com.eighthlight.filament.fx-spec
   (:require-macros [hiccup.core :as h]
-                   [specljs.core :refer [describe it should=]])
+                   [speclj.core :refer [describe it should=]])
   (:require [com.eighthlight.filament.fx :as fx]
             [com.eighthlight.filament.spec-helper :as helper]
             [domina :as dom]
             [domina.css :as css]
             [hiccup.core]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "FX"
 

diff --git a/spec/cljs/com/eighthlight/filament/inplace_field_spec.cljs b/spec/cljs/com/eighthlight/filament/inplace_field_spec.cljs
@@ -1,6 +1,6 @@
 (ns com.eighthlight.filament.inplace-field-spec
   (:require-macros [hiccup.core :as h]
-                   [specljs.core :refer [describe context it should= with before around should-contain should-not-contain stub with-stubs should-have-invoked should-not-have-invoked]])
+                   [speclj.core :refer [describe context it should= with before around should-contain should-not-contain stub with-stubs should-have-invoked should-not-have-invoked]])
   (:require [com.eighthlight.filament.fx :as fx]
             [com.eighthlight.filament.inplace-field :as inplace]
             [com.eighthlight.filament.modal :as modal]
@@ -10,7 +10,7 @@
             [domina.css :as css]
             [domina.events :as event]
             [hiccup.core]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Inplace Field"
 

diff --git a/spec/cljs/com/eighthlight/filament/modal_spec.cljs b/spec/cljs/com/eighthlight/filament/modal_spec.cljs
@@ -1,5 +1,5 @@
 (ns com.eighthlight.filament.modal-spec
-  (:require-macros [specljs.core :refer [describe it should= should-not=]])
+  (:require-macros [speclj.core :refer [describe it should= should-not=]])
   (:require [com.eighthlight.filament.fx :as fx]
             [com.eighthlight.filament.modal :as modal]
             [com.eighthlight.filament.spec-helper :as helper]
@@ -8,7 +8,7 @@
             [domina.css :as css]
             [domina.xpath :as xpath]
             [domina.events :as event]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Modal"
 

diff --git a/spec/cljs/com/eighthlight/filament/util_spec.cljs b/spec/cljs/com/eighthlight/filament/util_spec.cljs
@@ -1,12 +1,12 @@
 (ns com.eighthlight.filament.util-spec
   (:require-macros [hiccup.core :as h]
-                   [specljs.core :refer [should should-not describe context it should= with before]])
+                   [speclj.core :refer [should should-not describe context it should= with before]])
   (:require [com.eighthlight.filament.spec-helper :as helper]
             [com.eighthlight.filament.util :as util]
             [domina :as dom]
             [domina.css :as css]
             [hiccup.core]
-            [specljs.core]))
+            [speclj.core]))
 
 (describe "Util"
 

diff --git a/src/cljs/com/eighthlight/filament/spec_helper.cljs b/src/cljs/com/eighthlight/filament/spec_helper.cljs
@@ -1,9 +1,9 @@
 (ns com.eighthlight.filament.spec-helper
-  (:require-macros [specljs.core :refer [after around before]])
+  (:require-macros [speclj.core :refer [after around before]])
   (:require [domina :as dom]
             [domina.css :as css]
             [domina.events :as event]
-            [specljs.core]))
+            [speclj.core]))
 
 (defn with-clean-dom []
   (after