mirror of
https://github.com/penpot/penpot.git
synced 2026-07-29 17:36:17 +00:00
feat(backend): adapt pages tests to new api
This commit is contained in:
parent
210fbb9535
commit
e0600a3058
@ -2,11 +2,9 @@
|
|||||||
(:require [clojure.test :as t]
|
(:require [clojure.test :as t]
|
||||||
[promesa.core :as p]
|
[promesa.core :as p]
|
||||||
[suricatta.core :as sc]
|
[suricatta.core :as sc]
|
||||||
[catacumba.testing :refer (with-server)]
|
|
||||||
[buddy.core.codecs :as codecs]
|
|
||||||
[uxbox.db :as db]
|
|
||||||
[uxbox.util.uuid :as uuid]
|
[uxbox.util.uuid :as uuid]
|
||||||
[uxbox.frontend :as uft]
|
[uxbox.db :as db]
|
||||||
|
[uxbox.api :as uapi]
|
||||||
[uxbox.services.projects :as uspr]
|
[uxbox.services.projects :as uspr]
|
||||||
[uxbox.services.pages :as uspg]
|
[uxbox.services.pages :as uspg]
|
||||||
[uxbox.services :as usv]
|
[uxbox.services :as usv]
|
||||||
@ -14,211 +12,211 @@
|
|||||||
|
|
||||||
(t/use-fixtures :each th/database-reset)
|
(t/use-fixtures :each th/database-reset)
|
||||||
|
|
||||||
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; ;; Frontend Test
|
;; Frontend Test
|
||||||
;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
|
|
||||||
;; (t/deftest test-http-page-create
|
(t/deftest test-http-page-create
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj (uspr/create-project conn {:user (:id user) :name "proj1"})]
|
proj (uspr/create-project conn {:user (:id user) :name "proj1"})]
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+ "/api/pages")
|
(let [uri (str th/+base-url+ "/api/pages")
|
||||||
;; params {:body {:project (:id proj)
|
params {:body {:project (:id proj)
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "1"
|
:metadata "1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobile"}}
|
:layout "mobile"}}
|
||||||
;; [status data] (th/http-post user uri params)]
|
[status data] (th/http-post user uri params)]
|
||||||
;; ;; (println "RESPONSE:" status data)
|
;; (println "RESPONSE:" status data)
|
||||||
;; (t/is (= 201 status))
|
(t/is (= 201 status))
|
||||||
;; (t/is (= (:data (:body params)) (:data data)))
|
(t/is (= (:data (:body params)) (:data data)))
|
||||||
;; (t/is (= (:user data) (:id user)))
|
(t/is (= (:user data) (:id user)))
|
||||||
;; (t/is (= (:name data) "page1")))))))
|
(t/is (= (:name data) "page1")))))))
|
||||||
|
|
||||||
;; (t/deftest test-http-page-update
|
(t/deftest test-http-page-update
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
||||||
;; data {:id (uuid/random)
|
data {:id (uuid/random)
|
||||||
;; :user (:id user)
|
:user (:id user)
|
||||||
;; :project (:id proj)
|
:project (:id proj)
|
||||||
;; :version 0
|
:version 0
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "2"
|
:metadata "2"
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobil"}
|
:layout "mobil"}
|
||||||
;; page (uspg/create-page conn data)]
|
page (uspg/create-page conn data)]
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+ (str "/api/pages/" (:id page)))
|
(let [uri (str th/+base-url+ (str "/api/pages/" (:id page)))
|
||||||
;; params {:body (assoc page :data "3")}
|
params {:body (assoc page :data "3")}
|
||||||
;; [status page'] (th/http-put user uri params)]
|
[status page'] (th/http-put user uri params)]
|
||||||
;; ;; (println "RESPONSE:" status page')
|
;; (println "RESPONSE:" status page')
|
||||||
;; (t/is (= 200 status))
|
(t/is (= 200 status))
|
||||||
;; (t/is (= "3" (:data page')))
|
(t/is (= "3" (:data page')))
|
||||||
;; (t/is (= 1 (:version page')))
|
(t/is (= 1 (:version page')))
|
||||||
;; (t/is (= (:user page') (:id user)))
|
(t/is (= (:user page') (:id user)))
|
||||||
;; (t/is (= (:name data) "page1")))))))
|
(t/is (= (:name data) "page1")))))))
|
||||||
|
|
||||||
;; (t/deftest test-http-page-update-metadata
|
(t/deftest test-http-page-update-metadata
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
||||||
;; data {:id (uuid/random)
|
data {:id (uuid/random)
|
||||||
;; :user (:id user)
|
:user (:id user)
|
||||||
;; :project (:id proj)
|
:project (:id proj)
|
||||||
;; :version 0
|
:version 0
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "2"
|
:metadata "2"
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobil"}
|
:layout "mobil"}
|
||||||
;; page (uspg/create-page conn data)]
|
page (uspg/create-page conn data)]
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+ (str "/api/pages/" (:id page) "/metadata"))
|
(let [uri (str th/+base-url+ (str "/api/pages/" (:id page) "/metadata"))
|
||||||
;; params {:body (assoc page :data "3")}
|
params {:body (assoc page :data "3")}
|
||||||
;; [status page'] (th/http-put user uri params)]
|
[status page'] (th/http-put user uri params)]
|
||||||
;; ;; (println "RESPONSE:" status page')
|
;; (println "RESPONSE:" status page')
|
||||||
;; (t/is (= 200 status))
|
(t/is (= 200 status))
|
||||||
;; (t/is (= "1" (:data page')))
|
(t/is (= "1" (:data page')))
|
||||||
;; (t/is (= 1 (:version page')))
|
(t/is (= 1 (:version page')))
|
||||||
;; (t/is (= (:user page') (:id user)))
|
(t/is (= (:user page') (:id user)))
|
||||||
;; (t/is (= (:name data) "page1")))))))
|
(t/is (= (:name data) "page1")))))))
|
||||||
|
|
||||||
;; (t/deftest test-http-page-delete
|
(t/deftest test-http-page-delete
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
||||||
;; data {:id (uuid/random)
|
data {:id (uuid/random)
|
||||||
;; :user (:id user)
|
:user (:id user)
|
||||||
;; :project (:id proj)
|
:project (:id proj)
|
||||||
;; :version 0
|
:version 0
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "2"
|
:metadata "2"
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobil"}
|
:layout "mobil"}
|
||||||
;; page (uspg/create-page conn data)]
|
page (uspg/create-page conn data)]
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+ (str "/api/pages/" (:id page)))
|
(let [uri (str th/+base-url+ (str "/api/pages/" (:id page)))
|
||||||
;; [status response] (th/http-delete user uri)]
|
[status response] (th/http-delete user uri)]
|
||||||
;; ;; (println "RESPONSE:" status response)
|
;; (println "RESPONSE:" status response)
|
||||||
;; (t/is (= 204 status))
|
(t/is (= 204 status))
|
||||||
;; (let [sqlv ["SELECT * FROM pages WHERE \"user\"=? AND deleted_at is null"
|
(let [sqlv ["SELECT * FROM pages WHERE \"user\"=? AND deleted_at is null"
|
||||||
;; (:id user)]
|
(:id user)]
|
||||||
;; result (sc/fetch conn sqlv)]
|
result (sc/fetch conn sqlv)]
|
||||||
;; (t/is (empty? result))))))))
|
(t/is (empty? result))))))))
|
||||||
|
|
||||||
;; (t/deftest test-http-page-list-by-project
|
(t/deftest test-http-page-list-by-project
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj1 (uspr/create-project conn {:user (:id user) :name "proj1"})
|
proj1 (uspr/create-project conn {:user (:id user) :name "proj1"})
|
||||||
;; proj2 (uspr/create-project conn {:user (:id user) :name "proj2"})
|
proj2 (uspr/create-project conn {:user (:id user) :name "proj2"})
|
||||||
;; data {:user (:id user)
|
data {:user (:id user)
|
||||||
;; :version 0
|
:version 0
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "2"
|
:metadata "2"
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobil"}
|
:layout "mobil"}
|
||||||
;; page1 (uspg/create-page conn (assoc data :project (:id proj1)))
|
page1 (uspg/create-page conn (assoc data :project (:id proj1)))
|
||||||
;; page2 (uspg/create-page conn (assoc data :project (:id proj2)))]
|
page2 (uspg/create-page conn (assoc data :project (:id proj2)))]
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+ (str "/api/projects/" (:id proj1) "/pages"))
|
(let [uri (str th/+base-url+ (str "/api/pages?project=" (:id proj1)))
|
||||||
;; [status response] (th/http-get user uri)]
|
[status response] (th/http-get user uri)]
|
||||||
;; ;; (println "RESPONSE:" status response)
|
;; (println "RESPONSE:" status response)
|
||||||
;; (t/is (= 200 status))
|
(t/is (= 200 status))
|
||||||
;; (t/is (= 1 (count response)))
|
(t/is (= 1 (count response)))
|
||||||
;; (t/is (= (:id (first response)) (:id page1))))))))
|
(t/is (= (:id (first response)) (:id page1))))))))
|
||||||
|
|
||||||
;; (t/deftest test-http-page-history-retrieve
|
(t/deftest test-http-page-history-retrieve
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
||||||
;; data {:id (uuid/random)
|
data {:id (uuid/random)
|
||||||
;; :user (:id user)
|
:user (:id user)
|
||||||
;; :project (:id proj)
|
:project (:id proj)
|
||||||
;; :version 0
|
:version 0
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "2"
|
:metadata "2"
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobil"}
|
:layout "mobil"}
|
||||||
;; page (uspg/create-page conn data)]
|
page (uspg/create-page conn data)]
|
||||||
;; (dotimes [i 100]
|
(dotimes [i 100]
|
||||||
;; (let [page (uspg/get-page-by-id conn (:id data))]
|
(let [page (uspg/get-page-by-id conn (:id data))]
|
||||||
;; (uspg/update-page conn (assoc page :data (str i)))))
|
(uspg/update-page conn (assoc page :data (str i)))))
|
||||||
|
|
||||||
;; ;; Check inserted history
|
;; Check inserted history
|
||||||
;; (let [sqlv ["SELECT * FROM pages_history WHERE page=?" (:id data)]
|
(let [sqlv ["SELECT * FROM pages_history WHERE page=?" (:id data)]
|
||||||
;; result (sc/fetch conn sqlv)]
|
result (sc/fetch conn sqlv)]
|
||||||
;; (t/is (= (count result) 101)))
|
(t/is (= (count result) 101)))
|
||||||
|
|
||||||
;; ;; Check retrieve all items
|
;; Check retrieve all items
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+ "/api/pages/" (:id page) "/history")
|
(let [uri (str th/+base-url+ "/api/pages/" (:id page) "/history")
|
||||||
;; [status result] (th/http-get user uri nil)]
|
[status result] (th/http-get user uri nil)]
|
||||||
;; ;; (println "RESPONSE:" status result)
|
;; (println "RESPONSE:" status result)
|
||||||
;; (t/is (= (count result) 10))
|
(t/is (= (count result) 10))
|
||||||
;; (t/is (= 200 status))
|
(t/is (= 200 status))
|
||||||
;; (t/is (= 100 (:version (first result))))
|
(t/is (= 100 (:version (first result))))
|
||||||
|
|
||||||
;; (let [params {:query {:since (:version (last result))
|
(let [params {:query {:since (:version (last result))
|
||||||
;; :max 20}}
|
:max 20}}
|
||||||
;; [status result] (th/http-get user uri params)]
|
[status result] (th/http-get user uri params)]
|
||||||
;; ;; (println "RESPONSE:" status result)
|
;; (println "RESPONSE:" status result)
|
||||||
;; (t/is (= (count result) 20))
|
(t/is (= (count result) 20))
|
||||||
;; (t/is (= 200 status))
|
(t/is (= 200 status))
|
||||||
;; (t/is (= 90 (:version (first result))))))
|
(t/is (= 90 (:version (first result))))))
|
||||||
;; ))))
|
))))
|
||||||
|
|
||||||
;; (t/deftest test-http-page-history-update
|
(t/deftest test-http-page-history-update
|
||||||
;; (with-open [conn (db/connection)]
|
(with-open [conn (db/connection)]
|
||||||
;; (let [user (th/create-user conn 1)
|
(let [user (th/create-user conn 1)
|
||||||
;; proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
proj (uspr/create-project conn {:user (:id user) :name "proj1"})
|
||||||
;; data {:id (uuid/random)
|
data {:id (uuid/random)
|
||||||
;; :user (:id user)
|
:user (:id user)
|
||||||
;; :project (:id proj)
|
:project (:id proj)
|
||||||
;; :version 0
|
:version 0
|
||||||
;; :data "1"
|
:data "1"
|
||||||
;; :metadata "2"
|
:metadata "2"
|
||||||
;; :name "page1"
|
:name "page1"
|
||||||
;; :width 200
|
:width 200
|
||||||
;; :height 200
|
:height 200
|
||||||
;; :layout "mobil"}
|
:layout "mobil"}
|
||||||
;; page (uspg/create-page conn data)]
|
page (uspg/create-page conn data)]
|
||||||
|
|
||||||
;; (dotimes [i 10]
|
(dotimes [i 10]
|
||||||
;; (let [page (uspg/get-page-by-id conn (:id data))]
|
(let [page (uspg/get-page-by-id conn (:id data))]
|
||||||
;; (uspg/update-page conn (assoc page :data (str i)))))
|
(uspg/update-page conn (assoc page :data (str i)))))
|
||||||
|
|
||||||
;; ;; Check inserted history
|
;; Check inserted history
|
||||||
;; (let [sql (str "SELECT * FROM pages_history "
|
(let [sql (str "SELECT * FROM pages_history "
|
||||||
;; " WHERE page=? ORDER BY created_at DESC")
|
" WHERE page=? ORDER BY created_at DESC")
|
||||||
;; result (sc/fetch conn [sql (:id data)])
|
result (sc/fetch conn [sql (:id data)])
|
||||||
;; item (first result)]
|
item (first result)]
|
||||||
|
|
||||||
;; (with-server {:handler (uft/routes)}
|
(th/with-server {:handler uapi/app}
|
||||||
;; (let [uri (str th/+base-url+
|
(let [uri (str th/+base-url+
|
||||||
;; "/api/pages/" (:id page)
|
"/api/pages/" (:id page)
|
||||||
;; "/history/" (:id item))
|
"/history/" (:id item))
|
||||||
;; params {:body {:label "test" :pinned true}}
|
params {:body {:label "test" :pinned true}}
|
||||||
;; [status data] (th/http-put user uri params)]
|
[status data] (th/http-put user uri params)]
|
||||||
;; ;; (println "RESPONSE:" status data)
|
;; (println "RESPONSE:" status data)
|
||||||
;; (t/is (= 200 status))
|
(t/is (= 200 status))
|
||||||
;; (t/is (= (:id data) (:id item))))))
|
(t/is (= (:id data) (:id item))))))
|
||||||
|
|
||||||
;; (let [sql (str "SELECT * FROM pages_history "
|
(let [sql (str "SELECT * FROM pages_history "
|
||||||
;; " WHERE page=? AND pinned = true "
|
" WHERE page=? AND pinned = true "
|
||||||
;; " ORDER BY created_at DESC")
|
" ORDER BY created_at DESC")
|
||||||
;; result (sc/fetch-one conn [sql (:id data)])]
|
result (sc/fetch-one conn [sql (:id data)])]
|
||||||
;; (t/is (= "test" (:label result)))
|
(t/is (= "test" (:label result)))
|
||||||
;; (t/is (= true (:pinned result)))))))
|
(t/is (= true (:pinned result)))))))
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user