Skip to content

Commit 595e7c0

Browse files
committed
Merge pull request #172 from cichli/rename-value-slot
Rename `value` slot in `ns-list` and `ns-vars` responses
2 parents c2b49db + b7df7c1 commit 595e7c0

File tree

2 files changed

+21
-6
lines changed

2 files changed

+21
-6
lines changed

src/cider/nrepl/middleware/ns.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@
4343

4444
(defn ns-list-reply
4545
[{:keys [transport] :as msg}]
46-
(transport/send transport (response-for msg :value (ns-list msg)))
46+
(transport/send transport (response-for msg :ns-list (ns-list msg)))
4747
(transport/send transport (response-for msg :status :done)))
4848

4949
(defn ns-vars-reply
5050
[{:keys [transport] :as msg}]
51-
(transport/send transport (response-for msg :value (ns-vars msg)))
51+
(transport/send transport (response-for msg :ns-vars (ns-vars msg)))
5252
(transport/send transport (response-for msg :status :done)))
5353

5454
(defn wrap-ns
Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,27 @@
11
(ns cider.nrepl.middleware.ns-test
2-
(:require
3-
[clojure.test :refer :all]
4-
[cider.nrepl.middleware.test-transport :refer [messages test-transport]]
5-
[cider.nrepl.middleware.ns :refer [ns-list-clj ns-vars-clj]]))
2+
(:require [cider.nrepl.middleware.test-transport :refer [messages test-transport]]
3+
[cider.nrepl.middleware.test-session :as session]
4+
[cider.nrepl.middleware.ns :refer [ns-list-clj ns-vars-clj]]
5+
[clojure.test :refer :all]))
66

77
(deftest test-toogle-ns-list
88
(is (= (count (all-ns)) (count (ns-list-clj)))))
99

1010
(deftest test-toogle-ns-vars
1111
(let [ns "clojure.core"]
1212
(is (= (count (ns-publics (symbol ns))) (count (ns-vars-clj ns))))))
13+
14+
;; integration tests
15+
16+
(use-fixtures :each session/session-fixture)
17+
18+
(deftest ns-list-integration-test
19+
(let [ns-list (:ns-list (session/message {:op "ns-list"}))]
20+
(is (sequential? ns-list))
21+
(is (every? string? ns-list))))
22+
23+
(deftest ns-vars-integration-test
24+
(let [ns-vars (:ns-vars (session/message {:op "ns-vars"
25+
:ns "clojure.walk"}))]
26+
(is (sequential? ns-vars))
27+
(is (every? string? ns-vars))))

0 commit comments

Comments
 (0)