Merge pull request #1424 from marcomorain/fix-1328

Use test-var-query for all test commands
BetterThanTomorrow · Dec 11, 2021 · f855d8d · f855d8d
2 parents b5b834b + 9960efb
commit f855d8d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,9 +5,9 @@ Changes to Calva.
 ## [Unreleased]
 - Fix: [Babashka Jack-In REPL doesn't show eval errors](https://github.com/BetterThanTomorrow/calva/issues/1413)
 - [Inform about conflict with the Clojure extension](https://github.com/BetterThanTomorrow/calva/issues/1427)
+- Fix: [Run All Tests command doesn't run tests in .cljc file with reader conditional in ns](https://github.com/BetterThanTomorrow/calva/issues/1328).
 - Fix: [Allow LSP features on jar files](https://github.com/BetterThanTomorrow/calva/issues/1421)
 
-
 ## [2.0.228] - 2021-12-02
 - Revert: Parinfer Experimental
 - Revert: Full Format Experimental

diff --git a/src/nrepl/index.ts b/src/nrepl/index.ts
@@ -447,7 +447,13 @@ export class NReplSession {
         return new Promise<cider.TestResults>((resolve, reject) => {
             let id = this.client.nextId;
             this.messageHandlers[id] = resultHandler(resolve, reject);
-            this.client.write({ op: "test-all", id, session: this.sessionId, "load?": true });
+            this.client.write({
+                op: "test-var-query", id, session: this.sessionId, "var-query": {
+                    "ns-query": {
+                        'test?': true
+                    }
+                }
+            });
         })
     }