Merge pull request #358 from areina/fix-auto-ns-for-cljs-test

Require test framework in cljs files too

Author: expez

CHANGELOG.md

@@ -6,6 +6,7 @@
 - [#301] (https://github.com/clojure-emacs/clj-refactor.el/issues/301) `ad`  has gained a prefix to declare the symbol under the cursor.
 - [#312](https://github.com/clojure-emacs/clj-refactor.el/issues/312) Allow `sut` alias to be customized.
 - [#305](https://github.com/clojure-emacs/clj-refactor.el/issues/305) Don't call lookup-alias for non namespaced keywords at all when slash is typed. However trigger lookup alias with the leading :: stripped off the prefix if the keyword is namespaced.
+- Require a custom test framework for Clojurescript test files. By default it's `cljs.test` but it can be customized with `cljr-cljs-clojure-test-declaration`.
 
 ### Changes
 

clj-refactor.el

@@ -194,8 +194,13 @@ won't run if there is a broken namespace in the project."
   :group 'cljr
   :type 'string)
 
+(defcustom cljr-cljs-clojure-test-declaration "[cljs.test :as t :include-macros true]"
+  "The require form to use when cljs.test is in use in a cljs file."
+  :group 'cljr
+  :type 'string)
+
 (defcustom cljr-clojure-test-declaration "[clojure.test :as t]"
-  "The require form to use when clojure.test and cljs.test is in use in a cljc file."
+  "The require form to use when clojure.test is in use in a clj file."
   :group 'cljr
   :type 'string)
 
@@ -978,7 +983,7 @@ If CLJS? is T we insert in the cljs part of the ns declaration."
       (mapconcat 'identity (append (butlast ns-chunks) (list src-ns)) "."))))
 
 (defun cljr--cljs-file-p (&optional buf)
-  "Is BUF, or the current buffer, visiting a cljc file?"
+  "Is BUF, or the current buffer, visiting a cljs file?"
   (s-equals-p (file-name-extension (buffer-file-name (or buf (current-buffer))))
               "cljs"))
 
@@ -1007,6 +1012,8 @@ If CLJS? is T we insert in the cljs part of the ns declaration."
                 cljr-midje-test-declaration)
                ((cljr--project-depends-on-p "expectations")
                 cljr-expectations-test-declaration)
+	       ((cljr--cljs-file-p)
+		cljr-cljs-clojure-test-declaration)
                ((cljr--cljc-file-p)
                 cljr-cljc-clojure-test-declaration)
                (t cljr-clojure-test-declaration))))

features/auto-ns.feature

@@ -74,3 +74,12 @@ Feature: Add namespace to blank .clj files
                 #?(:clj [clojure.test :as t]
                    :cljs [cljs.test :as t :include-macros true])))
     """
+
+  Scenario: cljs file
+    When I open file "tmp/test/cljr/core_test.cljs"
+    Then I should see:
+    """
+    (ns cljr.core-test
+      (:require [cljr.core :as sut]
+                [cljs.test :as t :include-macros true]))
+    """