Restore clj-github.test-helpers/build-spec behavior

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.9.1
+
+- Fix regression in `clj-github.test-helpers/build-spec`, restoring its behavior to pre-0.8.0 (return plain data, not quoted forms)
+- Fix bug in default `/app/installations` mock
+
 ## 0.9.0
 
 - Add function to create releases for repositories

project.clj

@@ -1,4 +1,4 @@
-(defproject dev.nubank/clj-github "0.9.0"
+(defproject dev.nubank/clj-github "0.9.1"
   :description "A Clojure library for interacting with the github developer API"
   :url "https://github.com/nubank/clj-github"
   :license {:name "EPL-2.0 OR GPL-2.0-or-later WITH Classpath-exception-2.0"

src/clj_github/test_helpers.clj

@@ -4,53 +4,29 @@
             [org.httpkit.fake :as fake])
   (:import (java.util.regex Pattern)))
 
-
-(defn- spec-type [spec]
+(defn- request-spec [request]
   (cond
-    (-> spec meta :path) :path
-    (string? spec) :string
-    (map? spec) :map
-    (instance? Pattern spec) :pattern
-    :else :form))
-
-(defmulti spec-builder spec-type)
-
-(defmethod spec-builder :string [request]
-  (str github-url request))
-
-(defmethod spec-builder :map [request]
-  (if (:path request)
-    `(let [request# ~request
-           path#    (:path request#)]
-       (assoc request# :url (str github-url path#)))
-    request))
-
-(defmethod spec-builder :form [request]
-  request)
-
-(defmethod spec-builder :path [form]
-  `(spec-builder ~form))
-
-(defmethod spec-builder :pattern [pattern]
-  {:url pattern})
-
-(defn -add-default-content-type
-  [response]
-  (assoc-in response [:headers :content-type] "application/json"))
-
-(defn add-default-content-type [response]
-  `(let [responder# (fake/responder ~response)]
-     (fn [origin-fn# opts# callback#]
-       ((or callback# identity)
-        (responder# origin-fn# opts# -add-default-content-type)))))
-
-(defn build-spec [spec]
-  (reduce (fn [processed-fakes [request response]]
-            (-> processed-fakes
-                (conj (spec-builder request))
-                (conj (add-default-content-type response))))
-          [(str github-url "app/installations") "{}"]
-          (partition 2 spec)))
+    (string? request)                    (str github-url request)
+    (instance? Pattern request)          {:url request}
+    (and (map? request) (:path request)) (assoc request :url (str github-url (:path request)))
+    :else                                request))
+
+(defn- response-spec [response]
+  (let [responder  (fake/responder response)
+        force-json #(assoc-in % [:headers :content-type] "application/json")]
+    (fn [orig-fn opts callback]
+      ((or callback identity)
+       (responder orig-fn opts force-json)))))
+
+(defn ^:internal build-spec
+  "Converts a `with-fake-github`-style spec (a sequence of request/response
+   pairs) into a value suitable for `org.httpkit.fake/with-fake-http`.
+
+   Do not call directly."
+  [spec]
+  (into [(str github-url "/app/installations") "{}"]
+        (mapcat (fn [[req resp]] [(request-spec req) (response-spec resp)]))
+        (partition 2 spec)))
 
 (defmacro with-fake-github
   "A wrapper around `with-fake-http` that sets up some defaults for GitHub access.
@@ -67,5 +43,6 @@
   However, the response Content-Type header is forced to \"application/json\", so the body (if provided)
   must be a JSON value encoded as string."
   [spec & body]
-  `(fake/with-fake-http ~(build-spec spec)
-                        ~@body))
+  `(fake/with-fake-http
+     (build-spec ~(mapv #(if (-> % meta :path) `{:path ~%} %) spec))
+     ~@body))

test/clj_github/state_flow_helper_test.clj

@@ -0,0 +1,30 @@
+(ns clj-github.state-flow-helper-test
+  (:require [cheshire.core :as json]
+            [clj-github.httpkit-client :as httpkit-client]
+            [clj-github.state-flow-helper :as sfh]
+            [clojure.test :refer [deftest is]]
+            [matcher-combinators.test]
+            [state-flow.core :as state-flow]))
+
+(defn- init-system []
+  {:system {:github-client (httpkit-client/new-client {:token-fn (constantly "token")})}})
+
+(defn- run-flow [a-flow]
+  (state-flow/run* {:init init-system} a-flow))
+
+(deftest mock-github-flow-honors-responses
+  (let [response-body (json/generate-string {:id 1 :mergeable_state "clean"})
+        [result _] (run-flow
+                    (sfh/mock-github-flow
+                     {:initial-state {:orgs [{:name  "nubank"
+                                              :repos [{:name           "dummy-lib"
+                                                       :default_branch "main"}]}]}
+                      :responses     [{:path "/repos/nubank/dummy-lib/pulls/1" :method :get}
+                                      {:status 200
+                                       :body   response-body}]}
+                     (sfh/with-github-client
+                       (fn [client]
+                         (httpkit-client/request client {:path "/repos/nubank/dummy-lib/pulls/1"})))))]
+    (is (match? {:status 200
+                 :body   {:id 1 :mergeable_state "clean"}}
+                result))))