♻️ Make test helpers globally usable

common/src/app/common/test_helpers/components.cljc

@@ -4,22 +4,22 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.helpers.components
+(ns app.common.test-helpers.components
   (:require
    [app.common.data.macros :as dm]
    [app.common.files.changes-builder :as pcb]
    [app.common.files.helpers :as cfh]
    [app.common.geom.point :as gpt]
    [app.common.logic.libraries :as cll]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.container :as ctn]
    [app.common.types.file :as ctf]
    [app.common.types.pages-list :as ctpl]
-   [app.common.types.shape-tree :as ctst]
+   [app.common.types.shape-tree :as ctst]))
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]))
 
 (defn make-component
   [file label root-label & {:keys [] :as params}]

common/src/app/common/test_helpers/compositions.cljc

@@ -4,11 +4,11 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.helpers.compositions
+(ns app.common.test-helpers.compositions
   (:require
    [app.common.data :as d]
-   [common-tests.helpers.components :as thc]
+   [app.common.test-helpers.components :as thc]
-   [common-tests.helpers.shapes :as ths]))
+   [app.common.test-helpers.shapes :as ths]))
 
 (defn add-rect
   [file rect-label & {:keys [] :as params}]

common/src/app/common/test_helpers/files.cljc

@@ -4,19 +4,19 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.helpers.files
+(ns app.common.test-helpers.files
   (:require
    [app.common.data :as d]
    [app.common.features :as ffeat]
    [app.common.files.changes :as cfc]
    [app.common.files.validate :as cfv]
    [app.common.pprint :refer [pprint]]
+   [app.common.test-helpers.ids-map :as thi]
    [app.common.types.component :as ctk]
    [app.common.types.file :as ctf]
    [app.common.types.page :as ctp]
    [app.common.types.pages-list :as ctpl]
    [app.common.uuid :as uuid]
-   [common-tests.helpers.ids-map :as thi]
    [cuerdas.core :as str]))
 
 ;; ----- Files

common/src/app/common/test_helpers/ids_map.cljc

@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.helpers.ids-map
+(ns app.common.test-helpers.ids-map
   (:require
    [app.common.uuid :as uuid]))
 

common/src/app/common/test_helpers/shapes.cljc

@@ -4,10 +4,12 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns common-tests.helpers.shapes
+(ns app.common.test-helpers.shapes
   (:require
    [app.common.colors :as clr]
    [app.common.files.helpers :as cfh]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
    [app.common.types.color :as ctc]
    [app.common.types.colors-list :as ctcl]
    [app.common.types.file :as ctf]
@@ -15,9 +17,7 @@
    [app.common.types.shape :as cts]
    [app.common.types.shape-tree :as ctst]
    [app.common.types.typographies-list :as cttl]
-   [app.common.types.typography :as ctt]
+   [app.common.types.typography :as ctt]))
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]))
 
 (defn sample-shape
   [label & {:keys [type] :as params}]

common/test/common_tests/logic/chained_propagation_test.cljc

@@ -6,21 +6,16 @@
 
 (ns common-tests.logic.chained-propagation-test
   (:require
-   [app.common.files.changes :as ch]
    [app.common.files.changes-builder :as pcb]
    [app.common.logic.libraries :as cll]
    [app.common.logic.shapes :as cls]
-   [app.common.pprint :as pp]
+   [app.common.test-helpers.components :as thc]
-   [app.common.types.component :as ctk]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.types.container :as ctn]
-   [app.common.types.file :as  ctf]
+   [clojure.test :as t]))
-   [app.common.uuid :as uuid]
-   [clojure.test :as t]
-   [common-tests.helpers.components :as thc]
-   [common-tests.helpers.compositions :as tho]
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]))
 
 (t/use-fixtures :each thi/test-fixture)
 
@@ -55,8 +50,6 @@
 
           (step-update-color-comp-2 [file]
             (let [page    (thf/current-page file)
-                  file-id (:id file)
-                  page-id (:id page)
 
                   ;; Changes to update the color of the contained rectangle in component comp-2
                   changes-update-color-comp-1
@@ -75,7 +68,6 @@
           (step-propagate-comp-2 [file]
             (let [page    (thf/current-page file)
                   file-id (:id file)
-                  page-id (:id page)
 
                   ;; Changes to propagate the color changes of component comp-1
                   changes-sync-comp-1 (-> (pcb/empty-changes)
@@ -108,8 +100,7 @@
                                               (:objects page)
                                               {})
 
-                  file' (thf/apply-changes file changes-update-color-comp-3)
+                  file' (thf/apply-changes file changes-update-color-comp-3)]
-                  page' (thf/current-page file')]
 
               (t/is (= (first-child-fill-color file' :comp-1-comp-2) "#00FF00"))
               file'))
@@ -168,7 +159,6 @@
 
           (step-update-color-comp-4 [file]
             (let [page          (thf/current-page file)
-                  file-id       (:id file)
                   ;; Changes to update the color of the contained rectangle in component comp-4
                   changes-update-color-comp-4
                   (cls/generate-update-shapes (pcb/empty-changes nil (:id page))
@@ -184,8 +174,7 @@
               file'))
 
           (step-propagate-comp-4 [file]
-            (let [page    (thf/current-page file)
+            (let [file-id (:id file)
-                  file-id (:id file)
                   ;; Changes to propagate the color changes of component comp-4
                   changes-sync-comp-4 (-> (pcb/empty-changes)
                                           (cll/generate-sync-file-changes

common/test/common_tests/logic/comp_creation_test.cljc

@@ -12,15 +12,15 @@
    [app.common.geom.point :as gpt]
    [app.common.logic.libraries :as cll]
    [app.common.logic.shapes :as cls]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.types.component :as ctk]
    [app.common.types.components-list :as ctkl]
    [app.common.types.shape-tree :as ctst]
-   [clojure.test :as t]
+   [clojure.test :as t]))
-   [common-tests.helpers.components :as thc]
-   [common-tests.helpers.compositions :as tho]
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]))
 
 (t/use-fixtures :each thi/test-fixture)
 

common/test/common_tests/logic/comp_remove_swap_slots_test.cljc

@@ -10,19 +10,18 @@
    [app.common.geom.point :as gpt]
    [app.common.logic.libraries :as cll]
    [app.common.logic.shapes :as cls]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.types.component :as ctk]
    [app.common.uuid :as uuid]
    [clojure.test :as t]
-   [common-tests.helpers.components :as thc]
-   [common-tests.helpers.compositions :as tho]
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]
    [cuerdas.core :as str]))
 
 (t/use-fixtures :each thi/test-fixture)
 
-
 ;; Related .penpot file: common/test/cases/remove-swap-slots.penpot
 (defn- setup-file
   []

common/test/common_tests/logic/comp_reset_test.cljc

@@ -9,12 +9,12 @@
    [app.common.files.changes-builder :as pcb]
    [app.common.logic.libraries :as cll]
    [app.common.logic.shapes :as cls]
-   [clojure.test :as t]
+   [app.common.test-helpers.components :as thc]
-   [common-tests.helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
-   [common-tests.helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
-   [common-tests.helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
-   [common-tests.helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
-   [common-tests.helpers.shapes :as ths]))
+   [clojure.test :as t]))
 
 (t/use-fixtures :each thi/test-fixture)
 

common/test/common_tests/logic/comp_sync_test.cljc

@@ -8,19 +8,16 @@
   (:require
    [app.common.data :as d]
    [app.common.files.changes-builder :as pcb]
-   [app.common.files.shapes-helpers :as cfsh]
-   [app.common.geom.point :as gpt]
    [app.common.logic.libraries :as cll]
    [app.common.logic.shapes :as cls]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.types.component :as ctk]
-   [app.common.types.components-list :as ctkl]
    [app.common.types.shape-tree :as ctst]
-   [clojure.test :as t]
+   [clojure.test :as t]))
-   [common-tests.helpers.components :as thc]
-   [common-tests.helpers.compositions :as tho]
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]))
 
 (t/use-fixtures :each thi/test-fixture)
 

common/test/common_tests/logic/comp_touched_test.cljc

@@ -8,12 +8,12 @@
   (:require
    [app.common.files.changes-builder :as pcb]
    [app.common.logic.shapes :as cls]
-   [clojure.test :as t]
+   [app.common.test-helpers.components :as thc]
-   [common-tests.helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
-   [common-tests.helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
-   [common-tests.helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
-   [common-tests.helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
-   [common-tests.helpers.shapes :as ths]))
+   [clojure.test :as t]))
 
 (t/use-fixtures :each thi/test-fixture)
 

common/test/common_tests/logic/swap_and_reset_test.cljc

@@ -8,14 +8,14 @@
   (:require
    [app.common.files.changes-builder :as pcb]
    [app.common.logic.libraries :as cll]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.types.component :as ctk]
    [app.common.types.file :as  ctf]
-   [clojure.test :as t]
+   [clojure.test :as t]))
-   [common-tests.helpers.components :as thc]
-   [common-tests.helpers.compositions :as tho]
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]))
 
 (t/use-fixtures :each thi/test-fixture)
 

common/test/common_tests/types/types_libraries_test.cljc

@@ -7,6 +7,11 @@
 (ns common-tests.types.types-libraries-test
   (:require
    [app.common.data :as d]
+   [app.common.test-helpers.components :as thc]
+   [app.common.test-helpers.compositions :as tho]
+   [app.common.test-helpers.files :as thf]
+   [app.common.test-helpers.ids-map :as thi]
+   [app.common.test-helpers.shapes :as ths]
    [app.common.text :as txt]
    [app.common.types.colors-list :as ctcl]
    [app.common.types.component :as ctk]
@@ -14,12 +19,7 @@
    [app.common.types.file :as ctf]
    [app.common.types.pages-list :as ctpl]
    [app.common.types.typographies-list :as ctyl]
-   [clojure.test :as t]
+   [clojure.test :as t]))
-   [common-tests.helpers.components :as thc]
-   [common-tests.helpers.compositions :as tho]
-   [common-tests.helpers.files :as thf]
-   [common-tests.helpers.ids-map :as thi]
-   [common-tests.helpers.shapes :as ths]))
 
 (t/use-fixtures :each thi/test-fixture)