From b48434603125167faba7915c32ceae374dba512b Mon Sep 17 00:00:00 2001
From: Imbus <>
Date: Thu, 21 Mar 2024 02:26:30 +0100
Subject: [PATCH] Better integration test target

---
 Justfile         |  3 +++
 Makefile         |  3 +++
 backend/Makefile | 16 ++++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/Justfile b/Justfile
index cb905e4..90fabf6 100644
--- a/Justfile
+++ b/Justfile
@@ -23,10 +23,13 @@ load-release file:
 
 # Tests every part of the project
 testall:
+    cd frontend && npm install
     cd frontend && npm test
     cd frontend && npm run lint
+    cd frontend && npm run build
     cd backend && make test
     cd backend && make lint
+    cd backend && make itest
 
 # Cleans up everything related to the project
 clean: remove-podman-containers
diff --git a/Makefile b/Makefile
index 97db62e..51fb206 100644
--- a/Makefile
+++ b/Makefile
@@ -13,10 +13,13 @@ remove-podman-containers:
 
 # Tests every part of the project
 testall:
+	cd frontend && npm install
 	cd frontend && npm test
 	cd frontend && npm run lint
+	cd frontend && npm run build
 	cd backend && make test
 	cd backend && make lint
+	cd backend && make itest
 
 # Cleans up everything related to the project
 clean: remove-podman-containers
diff --git a/backend/Makefile b/backend/Makefile
index 331f8d5..3443e94 100644
--- a/backend/Makefile
+++ b/backend/Makefile
@@ -8,17 +8,19 @@ GOGET = $(GOCMD) get
 # SQLite database filename
 DB_FILE = db.sqlite3
 
+PROC_NAME = ttime_server
+
 # Directory containing migration SQL scripts
 MIGRATIONS_DIR = internal/database/migrations
 SAMPLE_DATA_DIR = internal/database/sample_data
 
 # Build target
 build:
-	$(GOBUILD) -o bin/server main.go
+	$(GOBUILD) -o bin/$(PROC_NAME) main.go
 
 # Run target
 run: build
-	./bin/server
+	./bin/$(PROC_NAME)
 
 watch: build
 	watchexec -c -w . -r make run
@@ -37,6 +39,16 @@ clean:
 test: db.sqlite3
 	$(GOTEST) ./... -count=1
 
+# Integration test target
+.PHONY: itest
+itest:
+	pgrep $(PROC_NAME) && echo "Server already running" && exit 1 || true
+	make build
+	./bin/$(PROC_NAME) >/dev/null 2>&1 &
+	sleep 1 # Adjust if needed
+	python ../testing.py
+	pkill $(PROC_NAME)
+
 # Get dependencies target
 deps:
 	$(GOGET) -v ./...