3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-18 14:46:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

🎉 Add more tests of components

Browse source
This commit is contained in:
Andrés Moya 2021-02-03 13:09:38 +01:00 • committed by Andrey Antukh
parent 068a099f37
commit cdab9ff69c
3 changed files with 178 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/app/main/data/workspace/libraries.cljs
View file

@ -319,7 +319,7 @@
(defn instantiate-component (defn instantiate-component
"Create a new shape in the current page, from the component with the given id "Create a new shape in the current page, from the component with the given id
in the given file library / current file library." in the given file library. Then selects the newly created instance."
[file-id component-id position] [file-id component-id position]
(us/assert ::us/uuid file-id) (us/assert ::us/uuid file-id)
(us/assert ::us/uuid component-id) (us/assert ::us/uuid component-id)

24
frontend/tests/app/test_helpers/libraries.cljs
View file

@ -57,7 +57,7 @@
(let [page (thp/current-page state) (let [page (thp/current-page state)
root-inst (cph/get-shape page root-inst-id) root-inst (cph/get-shape page root-inst-id)
file (dwlh/get-local-file state) file (dwlh/get-local-file state)
component (cph/get-component component (cph/get-component
(:component-id root-inst) (:component-id root-inst)
(:id file) (:id file)
@ -88,3 +88,25 @@
[shapes-inst shapes-master component])) [shapes-inst shapes-master component]))
(defn resolve-component
[state component-id]
(let [page (thp/current-page state)
file (dwlh/get-local-file state)
component (cph/get-component
component-id
(:id file)
file
nil)
root-master (cph/get-component-root
component)
shapes-master (cph/get-object-with-children
(:id root-master)
(:objects component))]
;; Validate that the component tree is well constructed
(run! is-noninstance shapes-master)
[shapes-master component]))

175
frontend/tests/app/test_library_sync.cljs
View file

@ -1,11 +1,13 @@
(ns app.test-library-sync (ns app.test-library-sync
(:require [cljs.test :as t :include-macros true] (:require [cljs.test :as t :include-macros true]
[cljs.pprint :refer [pprint]] [cljs.pprint :refer [pprint]]
[clojure.stacktrace :as stk]
[beicon.core :as rx] [beicon.core :as rx]
[linked.core :as lks] [linked.core :as lks]
[app.test-helpers.events :as the] [app.test-helpers.events :as the]
[app.test-helpers.pages :as thp] [app.test-helpers.pages :as thp]
[app.test-helpers.libraries :as thl] [app.test-helpers.libraries :as thl]
[app.common.geom.point :as gpt]
[app.common.data :as d] [app.common.data :as d]
[app.common.pages.helpers :as cph] [app.common.pages.helpers :as cph]
[app.main.data.workspace :as dw] [app.main.data.workspace :as dw]
@ -57,11 +59,11 @@
(t/is (= (get-in new-state [:workspace-data (t/is (= (get-in new-state [:workspace-data
:recent-colors]) :recent-colors])
[color])))) [color]))))
(rx/subs done)))))) (rx/subs done done))))))
(t/deftest test-add-component-from-single-shape (t/deftest test-add-component-from-single-shape
(t/testing "Add a component from a single shape" (t/async done
(t/async done (try
(let [state (-> thp/initial-state (let [state (-> thp/initial-state
(thp/sample-page) (thp/sample-page)
(thp/sample-shape :shape1 :rect (thp/sample-shape :shape1 :rect
@ -70,7 +72,7 @@
(->> state (->> state
(the/do-update (dw/select-shape (thp/id :shape1))) (the/do-update (dw/select-shape (thp/id :shape1)))
(the/do-watch-update dwl/add-component) (the/do-watch-update dwl/add-component)
(rx/map (rx/do
(fn [new-state] (fn [new-state]
(let [shape1 (thp/get-shape new-state :shape1) (let [shape1 (thp/get-shape new-state :shape1)
@ -89,11 +91,19 @@
(thl/is-from-file group file)))) (thl/is-from-file group file))))
(rx/subs done)))))) (rx/subs
done
#(do
(println (.-stack %))
(done)))))
(catch :default e
(println (.-stack e))
(done)))))
(t/deftest test-add-component-from-several-shapes (t/deftest test-add-component-from-several-shapes
(t/testing "Add a component from several shapes" (t/async done
(t/async done (try
(let [state (-> thp/initial-state (let [state (-> thp/initial-state
(thp/sample-page) (thp/sample-page)
(thp/sample-shape :shape1 :rect (thp/sample-shape :shape1 :rect
@ -106,7 +116,7 @@
(thp/id :shape1) (thp/id :shape1)
(thp/id :shape2)))) (thp/id :shape2))))
(the/do-watch-update dwl/add-component) (the/do-watch-update dwl/add-component)
(rx/map (rx/do
(fn [new-state] (fn [new-state]
(let [shape1 (thp/get-shape new-state :shape1) (let [shape1 (thp/get-shape new-state :shape1)
@ -131,13 +141,21 @@
(thl/is-from-file group file)))) (thl/is-from-file group file))))
(rx/subs done)))))) (rx/subs
done
#(do
(println (.-stack %))
(done)))))
(catch :default e
(println (.-stack e))
(done)))))
(t/deftest test-add-component-from-group (t/deftest test-add-component-from-group
(t/testing "Add a component from a group" (t/async done
(t/async done (try
(let [ (let [state (-> thp/initial-state
state (-> thp/initial-state
(thp/sample-page) (thp/sample-page)
(thp/sample-shape :shape1 :rect (thp/sample-shape :shape1 :rect
{:name "Rect 1"}) {:name "Rect 1"})
@ -150,7 +168,7 @@
(->> state (->> state
(the/do-update (dw/select-shape (thp/id :group1))) (the/do-update (dw/select-shape (thp/id :group1)))
(the/do-watch-update dwl/add-component) (the/do-watch-update dwl/add-component)
(rx/map (rx/do
(fn [new-state] (fn [new-state]
(let [[[group shape1 shape2] (let [[[group shape1 shape2]
[c-group c-shape1 c-shape2] [c-group c-shape1 c-shape2]
@ -171,13 +189,20 @@
(thl/is-from-file group file)))) (thl/is-from-file group file))))
(rx/subs done)))))) (rx/subs
done
#(do
(println (.-stack %))
(done)))))
(catch :default e
(println (.-stack e))
(done)))))
(t/deftest test-rename-component (t/deftest test-rename-component
(t/testing "Rename a component" (t/async done
(t/async done (try
(let [ (let [state (-> thp/initial-state
state (-> thp/initial-state
(thp/sample-page) (thp/sample-page)
(thp/sample-shape :shape1 :rect (thp/sample-shape :shape1 :rect
{:name "Rect 1"}) {:name "Rect 1"})
@ -190,7 +215,7 @@
(the/do-watch-update (dwl/rename-component (the/do-watch-update (dwl/rename-component
(:component-id instance1) (:component-id instance1)
"Renamed component")) "Renamed component"))
(rx/map (rx/do
(fn [new-state] (fn [new-state]
(let [file (dwlh/get-local-file new-state) (let [file (dwlh/get-local-file new-state)
component (cph/get-component component (cph/get-component
@ -202,5 +227,113 @@
(t/is (= (:name component) (t/is (= (:name component)
"Renamed component"))))) "Renamed component")))))
(rx/subs done)))))) (rx/subs
done
#(do
(println (.-stack %))
(done)))))
(catch :default e
(println (.-stack e))
(done)))))
(t/deftest test-duplicate-component
(t/async done
(try
(let [state (-> thp/initial-state
(thp/sample-page)
(thp/sample-shape :shape1 :rect
{:name "Rect 1"})
(thp/make-component :instance1
[(thp/id :shape1)]))
instance1 (thp/get-shape state :instance1)
component-id (:component-id instance1)]
(->> state
(the/do-watch-update (dwl/duplicate-component
{:id component-id}))
(rx/do
(fn [new-state]
(let [new-component-id (->> (get-in new-state
[:workspace-data
:components])
(keys)
(filter #(not= % component-id))
(first))
[[instance1 shape1]
[c-instance1 c-shape1]
component1]
(thl/resolve-instance-and-master
new-state
(:id instance1))
[[c-component2 c-shape2]
component2]
(thl/resolve-component
new-state
new-component-id)]
(t/is (= (:name component2)
"Component-6")))))
(rx/subs
done
#(do
(println (.-stack %))
(done)))))
(catch :default e
(println (.-stack e))
(done)))))
(t/deftest test-instantiate-component
(t/async done
(try
(let [state (-> thp/initial-state
(thp/sample-page)
(thp/sample-shape :shape1 :rect
{:name "Rect 1"})
(thp/make-component :instance1
[(thp/id :shape1)]))
file (dwlh/get-local-file state)
instance1 (thp/get-shape state :instance1)
component-id (:component-id instance1)]
(->> state
(the/do-watch-update (dwl/instantiate-component
(:id file)
(:component-id instance1)
(gpt/point 100 100)))
(rx/do
(fn [new-state]
(let [new-instance-id (-> (get-in new-state
[:workspace-local :selected])
first)
[[instance2 shape2]
[c-instance2 c-shape2]
component]
(thl/resolve-instance-and-master
new-state
new-instance-id)]
(t/is (not= (:id instance1) (:id instance2)))
(t/is (= (:id component) component-id))
(t/is (= (:name instance2) "Component-7"))
(t/is (= (:name shape2) "Rect 1"))
(t/is (= (:name c-instance2) "Component-6"))
(t/is (= (:name c-shape2) "Rect 1")))))
(rx/subs
done
#(do
(println (.-stack %))
(done)))))
(catch :default e
(println (.-stack e))
(done)))))