tests pass

yetanalytics · Feb 27, 2025 · b8895c3 · b8895c3
1 parent ea58407
commit b8895c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 13 deletions.
diff --git a/src/test/lrsql/admin/protocol_test.clj b/src/test/lrsql/admin/protocol_test.clj
@@ -279,13 +279,14 @@
           (is (re-matches Base64RegEx secret-key))
           (is (= {:api-key    api-key
                   :secret-key secret-key
-                  :scopes     #{"all" "all/read"}}
-                 key-pair))
+                  :scopes     #{"all" "all/read"}}))
           (testing "and credential retrieval"
-            (is (= [{:api-key    api-key
-                     :secret-key secret-key
-                     :scopes     #{"all" "all/read"}}]
-                   (adp/-get-api-keys lrs acc-id))))
+            (is (let [[result] (adp/-get-api-keys lrs acc-id)]
+                  (and
+                   (= {:api-key api-key
+                       :secret-key secret-key
+                       :scopes #{"all" "all/read"}}
+                      (dissoc result :id))))))
           (testing "and credential update"
             (is (= {:api-key    api-key
                     :secret-key secret-key
@@ -298,12 +299,13 @@
                     api-key
                     secret-key
                     #{"all/read" "statements/read" "statements/read/mine"})))
-            (is (= [{:api-key    api-key
-                     :secret-key secret-key
-                     :scopes     #{"all/read"
-                                   "statements/read"
-                                   "statements/read/mine"}}]
-                   (adp/-get-api-keys lrs acc-id))))
+            (is (let [[result] (adp/-get-api-keys lrs acc-id)]
+                  (= {:api-key api-key
+                      :secret-key secret-key
+                      :scopes #{"all/read"
+                                "statements/read"
+                                "statements/read/mine"}}
+                     (dissoc result :id)))))
           (testing "and credential deletion"
             (adp/-delete-api-keys lrs acc-id api-key secret-key)
             (is (= []

diff --git a/src/test/lrsql/admin/route_test.clj b/src/test/lrsql/admin/route_test.clj
@@ -586,7 +586,8 @@
                        (u/parse-json :object? false)
                        (#(filter (fn [cred] (= (get cred "api-key") api-key))
                                  %))
-                       first)))))
+                       first
+                       (dissoc "id"))))))
         (testing "and updating"
           (let [req-scopes
                 ["all/read" "statements/read" "statements/read/mine"]