From 4e7966c8e80eefb5fd0408a8961b5bef0c927b01 Mon Sep 17 00:00:00 2001
From: Jason Rasmussen <jrasm91@gmail.com>
Date: Tue, 7 May 2024 23:33:17 -0400
Subject: [PATCH] chore: move test assets submodule (#9321)

---
 .dockerignore                         | 1 -
 .gitmodules                           | 2 +-
 e2e/docker-compose.yml                | 2 +-
 e2e/src/utils.ts                      | 4 ++--
 server/test/assets => e2e/test-assets | 0
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename server/test/assets => e2e/test-assets (100%)

diff --git a/.dockerignore b/.dockerignore
index f7947202cd..fc95d2c6ab 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -23,7 +23,6 @@ server/node_modules/
 server/upload/
 server/dist/
 server/www/
-server/test/assets/
 
 web/node_modules/
 web/coverage/
diff --git a/.gitmodules b/.gitmodules
index 3c57a9ad57..8c4cc4e205 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,5 +2,5 @@
 	path = mobile/.isar
 	url = https://github.com/isar/isar
 [submodule "server/test/assets"]
-	path = server/test/assets
+	path = e2e/test-assets
 	url = https://github.com/immich-app/test-assets
diff --git a/e2e/docker-compose.yml b/e2e/docker-compose.yml
index a1daf0207b..703a07254e 100644
--- a/e2e/docker-compose.yml
+++ b/e2e/docker-compose.yml
@@ -16,7 +16,7 @@ x-server-build: &server-common
     - IMMICH_METRICS=true
   volumes:
     - upload:/usr/src/app/upload
-    - ../server/test/assets:/data/assets
+    - ./test-assets:/test-assets
   depends_on:
     - redis
     - database
diff --git a/e2e/src/utils.ts b/e2e/src/utils.ts
index 5772b60217..908c87faed 100644
--- a/e2e/src/utils.ts
+++ b/e2e/src/utils.ts
@@ -56,8 +56,8 @@ const baseUrl = 'http://127.0.0.1:2283';
 export const shareUrl = `${baseUrl}/share`;
 export const app = `${baseUrl}/api`;
 // TODO move test assets into e2e/assets
-export const testAssetDir = path.resolve(`./../server/test/assets/`);
-export const testAssetDirInternal = '/data/assets';
+export const testAssetDir = path.resolve('./test-assets');
+export const testAssetDirInternal = '/test-assets';
 export const tempDir = tmpdir();
 export const asBearerAuth = (accessToken: string) => ({ Authorization: `Bearer ${accessToken}` });
 export const asKeyAuth = (key: string) => ({ 'x-api-key': key });
diff --git a/server/test/assets b/e2e/test-assets
similarity index 100%
rename from server/test/assets
rename to e2e/test-assets