From 1efd2eab5adf8b30965307de1a0f33b98f84b714 Mon Sep 17 00:00:00 2001
From: SPT-dev <spt-dev@noreply.dev.sp-tarkov.com>
Date: Thu, 2 Mar 2023 21:12:28 -0500
Subject: [PATCH] test: Test fix CYPRESS_BASE_URL

---
 .drone-docker.yml           | 22 +++++++++++++++++++++-
 items/frontend/package.json |  5 +++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/.drone-docker.yml b/.drone-docker.yml
index da04654..2110c13 100644
--- a/.drone-docker.yml
+++ b/.drone-docker.yml
@@ -38,14 +38,29 @@ steps:
       - npm -v
       - yarn --version
       - yarn --cwd ./items/frontend install
+    depends_on:
+      - replace hosts and user variables
+
+  - name: frontend
+    image: node:lts-alpine3.14
+    commands:
+      - node -v
+      - npm -v
+      - yarn --version
+      - yarn --cwd ./items/frontend start
+    detach: true
+    depends_on:
+      - install frontend dependencies
 
   - name: test frontend
-    image: cypress/base:16.13.0
+    image: cypress/browsers:chrome95
     commands:
       - node -v
       - npm -v
       - yarn --version
       - yarn --cwd ./items/frontend cy:run
+    depends_on:
+      - install frontend dependencies
 
   - name: build frontend
     image: node:lts-alpine3.14
@@ -57,6 +72,8 @@ steps:
       - rm -rf ./items/api/public/static/*
       - mv ./items/frontend/build/* ./items/api/public
       - rm ./items/api/public/index.html
+    depends_on:
+      - test frontend
     when:
       branch:
         - main
@@ -93,6 +110,9 @@ steps:
         from_secret: deploy_user_group
       SPT_ITEMS_PATH:
         from_secret: deploy_path
+    depends_on:
+      - check ansible syntax
+      - build frontend
     when:
       branch:
         - master
diff --git a/items/frontend/package.json b/items/frontend/package.json
index 096247f..e834248 100644
--- a/items/frontend/package.json
+++ b/items/frontend/package.json
@@ -37,9 +37,10 @@
         "build": "react-scripts build",
         "test:jest": "react-scripts test",
         "cy:start:app": "cross-env BROWSER=none react-scripts -r @cypress/instrument-cra start",
-        "cy:start:wait": "start-server-and-test cy:start:app",
+        "cy:start:wait": "start-server-and-test cy:start:app http://localhost:3000",
+        "cy:start:wait:ci": "start-server-and-test cy:start:app http://frontend:3000",
         "cy:open": "yarn run cy:start:wait -- \"cypress open\"",
-        "cy:run": "yarn run cy:start:wait -- \"cypress run\"",
+        "cy:run": "yarn run cy:start:wait:ci -- \"cypress run\"",
         "eject": "react-scripts eject"
     },
     "eslintConfig": {