From a5c3c19ccbd2c0f526187c7e99c3d6a10b55a4a0 Mon Sep 17 00:00:00 2001
From: Ashley <admin@ashleybailey.me>
Date: Tue, 7 Nov 2023 18:53:22 +0000
Subject: [PATCH] fix: testing script

---
 .../wizarr_backend/app/__init__.py            |  7 ++++
 package-lock.json                             | 39 +++----------------
 package.json                                  |  4 +-
 3 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/apps/wizarr-backend/wizarr_backend/app/__init__.py b/apps/wizarr-backend/wizarr_backend/app/__init__.py
index d0dce5107..23a509a05 100644
--- a/apps/wizarr-backend/wizarr_backend/app/__init__.py
+++ b/apps/wizarr-backend/wizarr_backend/app/__init__.py
@@ -28,6 +28,13 @@
     environment=app.debug and "development" or "production",
 )
 
+# Base route for testing
+@app.route("/")
+def server_online():
+    return {
+        "status": "online"
+    }, 200
+
 # Run migrations
 run_migrations()
 
diff --git a/package-lock.json b/package-lock.json
index 305cf3c7d..235cbe1bb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -146,7 +146,7 @@
                 "prettier": "3.0.2",
                 "sass": "^1.66.1",
                 "semantic-release": "^22.0.7",
-                "start-server-and-test": "^2.0.0",
+                "start-server-and-test": "^2.0.2",
                 "tailwind-scrollbar": "^3.0.5",
                 "tailwindcss": "^3.3.3",
                 "tailwindcss-inner-border": "^0.2.0",
@@ -27375,9 +27375,9 @@
             }
         },
         "node_modules/start-server-and-test": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.1.tgz",
-            "integrity": "sha512-8PFo4DLLLCDMuS51/BEEtE1m9CAXw1LNVtZSS1PzkYQh6Qf9JUwM4huYeSoUumaaoAyuwYBwCa9OsrcpMqcOdQ==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.2.tgz",
+            "integrity": "sha512-4sGS2QmETUwqeBUqtTLP7OqXp3PdDnevaWlPlrFQgn8+7uCgVg4Do7/H/ZhAAVyvnL3DqKyANhnLgcgxrjhrMA==",
             "dev": true,
             "dependencies": {
                 "arg": "^5.0.2",
@@ -27387,7 +27387,7 @@
                 "execa": "5.1.1",
                 "lazy-ass": "1.6.0",
                 "ps-tree": "1.2.0",
-                "wait-on": "7.0.1"
+                "wait-on": "7.1.0"
             },
             "bin": {
                 "server-test": "src/bin/start.js",
@@ -27404,16 +27404,6 @@
             "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
             "dev": true
         },
-        "node_modules/start-server-and-test/node_modules/axios": {
-            "version": "0.27.2",
-            "resolved": "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz",
-            "integrity": "sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==",
-            "dev": true,
-            "dependencies": {
-                "follow-redirects": "^1.14.9",
-                "form-data": "^4.0.0"
-            }
-        },
         "node_modules/start-server-and-test/node_modules/execa": {
             "version": "5.1.1",
             "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
@@ -27458,25 +27448,6 @@
                 "node": ">=10.17.0"
             }
         },
-        "node_modules/start-server-and-test/node_modules/wait-on": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-7.0.1.tgz",
-            "integrity": "sha512-9AnJE9qTjRQOlTZIldAaf/da2eW0eSRSgcqq85mXQja/DW3MriHxkpODDSUEg+Gri/rKEcXUZHe+cevvYItaog==",
-            "dev": true,
-            "dependencies": {
-                "axios": "^0.27.2",
-                "joi": "^17.7.0",
-                "lodash": "^4.17.21",
-                "minimist": "^1.2.7",
-                "rxjs": "^7.8.0"
-            },
-            "bin": {
-                "wait-on": "bin/wait-on"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
         "node_modules/statuses": {
             "version": "1.3.1",
             "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
diff --git a/package.json b/package.json
index 734717497..f951c66a8 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
         "start": "nx run-many --parallel --target=serve --projects=wizarr-frontend,wizarr-backend",
         "start:frontend": "nx run wizarr-frontend:serve",
         "start:backend": "nx run wizarr-backend:serve",
-        "test": "npm run start:backend & wait-on http://127.0.0.1:5000/api/health && npm run test:e2e",
+        "test": "start-server-and-test start:backend 5000 test:e2e",
         "test:e2e": "nx e2e wizarr-e2e",
         "prepare": "husky install"
     },
@@ -149,7 +149,7 @@
         "prettier": "3.0.2",
         "sass": "^1.66.1",
         "semantic-release": "^22.0.7",
-        "start-server-and-test": "^2.0.0",
+        "start-server-and-test": "^2.0.2",
         "tailwind-scrollbar": "^3.0.5",
         "tailwindcss": "^3.3.3",
         "tailwindcss-inner-border": "^0.2.0",