Skip to content

Commit 7849208

Browse files
committed
Use real cljs.test now that squint 0.11.187 ships it
Drops the stub macros and requires cljs.test directly under both targets. Adds (t/run-tests) at the end so the squint binary runs the suite.
1 parent 2db130c commit 7849208

4 files changed

Lines changed: 15 additions & 97 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"@lezer/lr": "^1.0.0",
2525
"@nextjournal/lezer-clojure": "1.0.0",
2626
"markdown-it-footnote": "^3.0.3",
27-
"squint-cljs": "../squint",
27+
"squint-cljs": "0.11.187",
2828
"w3c-keyname": "^2.2.4"
2929
},
3030
"comments": {

src-squint/nextjournal/clojure_mode_tests/macros.cljc

Lines changed: 0 additions & 83 deletions
This file was deleted.

test/nextjournal/clojure_mode_tests.cljc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
(ns nextjournal.clojure-mode-tests
2-
(:require #?@(:squint []
3-
:cljs [[cljs.test :refer [are testing deftest is]]])
2+
(:require [cljs.test :as t :refer [are testing deftest is]]
43
[nextjournal.clojure-mode :as cm-clojure]
54
[nextjournal.clojure-mode.util :as util]
65
[nextjournal.clojure-mode.test-utils :as test-utils]
@@ -10,9 +9,7 @@
109
[nextjournal.clojure-mode.extensions.eval-region :as eval-region]
1110
[nextjournal.scratch]
1211
#?@(:squint []
13-
:cljs [[nextjournal.livedoc :as livedoc]])
14-
#?(:squint ["assert" :as assert]))
15-
#?(:squint (:require-macros [nextjournal.clojure-mode-tests.macros :refer [deftest are testing is]])))
12+
:cljs [[nextjournal.livedoc :as livedoc]])))
1613

1714
(def extensions
1815
(.concat cm-clojure/default-extensions (eval-region/extension #js {}))
@@ -65,7 +62,7 @@
6562
))
6663

6764

68-
(deftest close-brackets
65+
(deftest close-brackets-test
6966
(testing "handle-open"
7067
(are [input insert expected]
7168
(= (apply-f #(close-brackets/handle-open % insert) input)
@@ -343,4 +340,6 @@
343340
(is (= "{:a 1}" (->> (eval-region/top-level-node state)
344341
(util/range-str state)))))))
345342

343+
#?(:squint (t/run-tests))
344+
346345
#_(prn (eval-region/cursor-node-string (test-utils/make-state extensions "(+ (+ 1 2)| 2 3)")))

yarn.lock

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -443,10 +443,10 @@ builtin-status-codes@^3.0.0:
443443
resolved "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz"
444444
integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=
445445

446-
chokidar@^4.0.1:
447-
version "4.0.1"
448-
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.1.tgz#4a6dff66798fb0f72a94f616abbd7e1a19f31d41"
449-
integrity sha512-n8enUVCED/KVRQlab1hr3MVpcVMvxtZjmEa956u+4YijlmQED223XMSYj2tLuKvr4jcCTzNNMpQDUer72MMmzA==
446+
chokidar@^4.0.3:
447+
version "4.0.3"
448+
resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-4.0.3.tgz#7be37a4c03c9aee1ecfe862a4a23b2c70c205d30"
449+
integrity sha512-Qgzu8kfBvo+cA4962jnP1KkS6Dop5NS6g7R5LFYJr4b8Ub94PPQXUksCw9PvXoeXPRRddRNC5C1JQUR2SMGtnA==
450450
dependencies:
451451
readdirp "^4.0.1"
452452

@@ -1103,10 +1103,12 @@ source-map@^0.5.6:
11031103
resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"
11041104
integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
11051105

1106-
squint-cljs@../squint:
1107-
version "0.8.159"
1106+
squint-cljs@0.11.187:
1107+
version "0.11.187"
1108+
resolved "https://registry.yarnpkg.com/squint-cljs/-/squint-cljs-0.11.187.tgz#6bfa181ca0f9d392224d7397361fbafd0ac2ec50"
1109+
integrity sha512-nSx9MfbvbyRgunal/FV4yDHN/bjxRbK8lvY9sErp2Yqsok52nOS/5wWjBSpGNSnjxGAznxy1/NXyWPToHrYjzg==
11081110
dependencies:
1109-
chokidar "^4.0.1"
1111+
chokidar "^4.0.3"
11101112

11111113
stream-browserify@^2.0.1:
11121114
version "2.0.2"

0 commit comments

Comments
 (0)