♻️ Refactor backend tests directory tree

.circleci/config.yml

@@ -3,19 +3,19 @@ jobs:
   build:
     docker:
       - image: penpotapp/devenv:latest
-      - image: cimg/postgres:13.5
+      - image: cimg/postgres:14.5
         environment:
           POSTGRES_USER: penpot_test
           POSTGRES_PASSWORD: penpot_test
           POSTGRES_DB: penpot_test
-      - image: cimg/redis:6.2.6
+      - image: cimg/redis:7.0.5
 
     working_directory: ~/repo
     resource_class: large
 
     environment:
       # Customize the JVM maximum heap limit
-      JVM_OPTS: -Xmx1g
+      JVM_OPTS: -Xmx4g
 
     steps:
       - checkout
@@ -29,6 +29,13 @@ jobs:
 
       - run: cd .clj-kondo && cat config.edn
 
+      - run:
+          name: frontend styles prettier
+          working_directory: "./frontend"
+          command: |
+            yarn install
+            yarn run lint-scss
+
       - run:
           name: common lint
           working_directory: "./common"
@@ -43,13 +50,6 @@ jobs:
             clj-kondo --version
             clj-kondo --parallel --lint src/
 
-      - run:
-          name: frontend styles prettier
-          working_directory: "./frontend"
-          command: |
-            yarn install
-            yarn run lint-scss
-
       - run:
           name: backend lint
           working_directory: "./backend"
@@ -57,16 +57,31 @@ jobs:
             clj-kondo --version
             clj-kondo --parallel --lint src/
 
-      # run backend test
+      - run:
+          working_directory: "./common"
+          name: common tests
+          command: |
+            yarn install
+            yarn run compile-test
+            node target/test.js
+            clojure -X:dev:test :patterns '["common-tests.test-.*"]'
+
+          environment:
+            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
+            JVM_OPTS: -Xmx4g
+
       - run:
           name: backend test
           working_directory: "./backend"
-          command: "clojure -X:dev:test"
+          command: |
+            clojure -X:dev:test :patterns '["app-tests.test-.*"]'
+
           environment:
             PENPOT_TEST_DATABASE_URI: "postgresql://localhost/penpot_test"
             PENPOT_TEST_DATABASE_USERNAME: penpot_test
             PENPOT_TEST_DATABASE_PASSWORD: penpot_test
             PENPOT_TEST_REDIS_URI: "redis://localhost/1"
+            JVM_OPTS: -Xmx4g
 
       - run:
           name: frontend tests
@@ -79,26 +94,6 @@ jobs:
           environment:
             PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
 
-      - run:
-          working_directory: "./common"
-          name: common tests (cljs)
-          command: |
-            yarn install
-            yarn run compile-test
-            node target/test.js
-
-          environment:
-            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
-
-      - run:
-          working_directory: "./common"
-          name: common tests (clj)
-          command: |
-            clojure -X:dev:test :patterns '["common-tests.test-.*"]'
-
-          environment:
-            PATH: /usr/local/nodejs/bin/:/usr/local/bin:/bin:/usr/bin
-
       - save_cache:
          paths:
            - ~/.m2

backend/dev/user.clj

@@ -63,7 +63,7 @@
 ;; --- Development Stuff
 
 (defn- run-tests
-  ([] (run-tests #"^app.*-test$"))
+  ([] (run-tests #"^app-tests.test-.*$"))
   ([o]
    (repl/refresh)
    (cond

backend/test/app_tests/test_bounce_handling.clj

@@ -4,12 +4,12 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.bounce-handling-test
+(ns app-tests.test-bounce-handling
   (:require
+   [app-tests.test-helpers :as th]
    [app.db :as db]
    [app.emails :as emails]
    [app.http.awsns :as awsns]
-   [app.test-helpers :as th]
    [app.tokens :as tokens]
    [app.util.time :as dt]
    [clojure.pprint :refer [pprint]]

backend/test/app_tests/test_email_sending.clj

@@ -4,13 +4,13 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.emails-test
+(ns app-tests.test-email-sending
   (:require
-   [clojure.test :as t]
+   [app-tests.test-helpers :as th]
-   [promesa.core :as p]
    [app.db :as db]
    [app.emails :as emails]
-   [app.test-helpers :as th]))
+   [clojure.test :as t]
+   [promesa.core :as p]))
 
 (t/use-fixtures :once th/state-init)
 (t/use-fixtures :each th/database-reset)

backend/test/app_tests/test_helpers.clj

@@ -4,7 +4,7 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.test-helpers
+(ns app-tests.test-helpers
   (:require
    [app.common.data :as d]
    [app.common.flags :as flags]
@@ -65,7 +65,7 @@
                     :name "test"
                     :file-uri "test"
                     :thumbnail-uri "test"
-                    :path (-> "app/test_files/template.penpot" io/resource fs/path)}]
+                    :path (-> "app_tests/test_files/template.penpot" io/resource fs/path)}]
         system (-> (merge main/system-config main/worker-config)
                    (assoc-in [:app.redis/redis :uri] (:redis-uri config))
                    (assoc-in [:app.db/pool :uri] (:database-uri config))

backend/test/app_tests/test_rpc_file.clj

@@ -4,14 +4,14 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-files-test
+(ns app-tests.test-rpc-file
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.db.sql :as sql]
    [app.http :as http]
    [app.storage :as sto]
-   [app.test-helpers :as th]
    [app.util.time :as dt]
    [clojure.test :as t]
    [datoteka.core :as fs]))
@@ -124,7 +124,7 @@
 (t/deftest file-gc-task
   (letfn [(create-file-media-object [{:keys [profile-id file-id]}]
             (let [mfile  {:filename "sample.jpg"
-                          :path (th/tempfile "app/test_files/sample.jpg")
+                          :path (th/tempfile "app_tests/test_files/sample.jpg")
                           :mtype "image/jpeg"
                           :size 312043}
                   params {::th/type :upload-file-media-object

backend/test/app_tests/test_rpc_font.clj

@@ -4,13 +4,13 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-fonts-test
+(ns app-tests.test-rpc-font
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
    [app.storage :as sto]
-   [app.test-helpers :as th]
    [clojure.test :as t]
    [datoteka.fs :as fs]
    [datoteka.io :as io]))
@@ -24,7 +24,7 @@
         proj-id (:default-project-id prof)
         font-id (uuid/custom 10 1)
 
-        ttfdata (-> (io/resource "app/test_files/font-1.ttf")
+        ttfdata (-> (io/resource "app_tests/test_files/font-1.ttf")
                     io/input-stream
                     io/read-as-bytes)
 
@@ -59,7 +59,7 @@
         proj-id (:default-project-id prof)
         font-id (uuid/custom 10 1)
 
-        data    (-> (io/resource "app/test_files/font-1.woff")
+        data    (-> (io/resource "app_tests/test_files/font-1.woff")
                     io/input-stream
                     io/read-as-bytes)
 

backend/test/app_tests/test_rpc_management.clj

@@ -4,16 +4,16 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-management-test
+(ns app-tests.test-rpc-management
   (:require
+   [app-tests.test-storage :refer [configure-storage-backend]]
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
    [app.storage :as sto]
-   [app.test-helpers :as th]
-   [app.storage-test :refer [configure-storage-backend]]
-   [clojure.test :as t]
    [buddy.core.bytes :as b]
+   [clojure.test :as t]
    [datoteka.core :as fs]))
 
 (t/use-fixtures :once th/state-init)

backend/test/app_tests/test_rpc_media.clj

@@ -4,12 +4,12 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-media-test
+(ns app-tests.test-rpc-media
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.storage :as sto]
-   [app.test-helpers :as th]
    [clojure.test :as t]
    [datoteka.core :as fs]))
 
@@ -60,7 +60,7 @@
                                    :project-id (:default-project-id prof)
                                    :is-shared false})
         mfile  {:filename "sample.jpg"
-                :path (th/tempfile "app/test_files/sample.jpg")
+                :path (th/tempfile "app_tests/test_files/sample.jpg")
                 :mtype "image/jpeg"
                 :size 312043}
 
@@ -99,7 +99,7 @@
                                    :project-id (:default-project-id prof)
                                    :is-shared false})
         mfile  {:filename "sample.jpg"
-                :path (th/tempfile "app/test_files/sample.jpg")
+                :path (th/tempfile "app_tests/test_files/sample.jpg")
                 :mtype "image/jpeg"
                 :size 312043}
 

backend/test/app_tests/test_rpc_profile.clj

@@ -4,14 +4,14 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-profile-test
+(ns app-tests.test-rpc-profile
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.config :as cf]
    [app.db :as db]
    [app.rpc.commands.auth :as cauth]
    [app.rpc.mutations.profile :as profile]
-   [app.test-helpers :as th]
    [app.tokens :as tokens]
    [app.util.time :as dt]
    [clojure.java.io :as io]
@@ -110,7 +110,7 @@
                   :profile-id (:id profile)
                   :file {:filename "sample.jpg"
                          :size 123123
-                         :path (th/tempfile "app/test_files/sample.jpg")
+                         :path (th/tempfile "app_tests/test_files/sample.jpg")
                          :mtype "image/jpeg"}}
             out  (th/mutation! data)]
 

backend/test/app_tests/test_rpc_project.clj

@@ -4,12 +4,12 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-projects-test
+(ns app-tests.test-rpc-project
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
-   [app.test-helpers :as th]
    [app.util.time :as dt]
    [clojure.test :as t]))
 

backend/test/app_tests/test_rpc_team.clj

@@ -4,13 +4,13 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-teams-test
+(ns app-tests.test-rpc-team
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.http :as http]
    [app.storage :as sto]
-   [app.test-helpers :as th]
    [app.tokens :as tokens]
    [app.util.time :as dt]
    [clojure.test :as t]

backend/test/app_tests/test_rpc_viewer.clj

@@ -4,11 +4,11 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.services-viewer-test
+(ns app-tests.test-rpc-viewer
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.uuid :as uuid]
    [app.db :as db]
-   [app.test-helpers :as th]
    [clojure.test :as t]
    [datoteka.core :as fs]))
 

backend/test/app_tests/test_storage.clj

@@ -4,13 +4,13 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.storage-test
+(ns app-tests.test-storage
   (:require
+   [app-tests.test-helpers :as th]
    [app.common.exceptions :as ex]
    [app.common.uuid :as uuid]
    [app.db :as db]
    [app.storage :as sto]
-   [app.test-helpers :as th]
    [app.util.time :as dt]
    [clojure.test :as t]
    [cuerdas.core :as str]
@@ -126,7 +126,7 @@
                                     :is-shared false})
 
         mfile   {:filename "sample.jpg"
-                 :path (th/tempfile "app/test_files/sample.jpg")
+                 :path (th/tempfile "app_tests/test_files/sample.jpg")
                  :mtype "image/jpeg"
                  :size 312043}
 
@@ -196,12 +196,12 @@
                                     :project-id proj-id
                                     :is-shared false})
 
-        ttfdata (-> (io/resource "app/test_files/font-1.ttf")
+        ttfdata (-> (io/resource "app_tests/test_files/font-1.ttf")
                     io/input-stream
                     io/read-as-bytes)
 
         mfile   {:filename "sample.jpg"
-                 :path (th/tempfile "app/test_files/sample.jpg")
+                 :path (th/tempfile "app_tests/test_files/sample.jpg")
                  :mtype "image/jpeg"
                  :size 312043}
 
@@ -267,7 +267,7 @@
                                     :project-id (:default-project-id prof)
                                     :is-shared false})
         mfile   {:filename "sample.jpg"
-                 :path (th/tempfile "app/test_files/sample.jpg")
+                 :path (th/tempfile "app_tests/test_files/sample.jpg")
                  :mtype "image/jpeg"
                  :size 312043}
 

backend/test/app_tests/test_telemetry_task.clj

@@ -4,11 +4,11 @@
 ;;
 ;; Copyright (c) KALEIDOS INC
 
-(ns app.tasks-telemetry-test
+(ns app-tests.test-telemetry-task
   (:require
+   [app-tests.test-helpers :as th]
    [app.db :as db]
    [app.emails :as emails]
-   [app.test-helpers :as th]
    [app.util.time :as dt]
    [clojure.pprint :refer [pprint]]
    [clojure.test :as t]