Merge pull request #6475 from NMDSdevopsServiceAdm/spike/review-e2e-t…

…esting Spike/review e2e testing
NMDSdevopsServiceAdm · Jan 21, 2025 · 17fb1aa · 17fb1aa
2 parents febcf7a + a50e775
commit 17fb1aa
Show file tree

Hide file tree

Showing 65 changed files with 25,656 additions and 27,313 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,7 +79,9 @@ TESTS.xml
 cypress/screenshots
 cypress/videos
 cypress/fixtures
-
+frontend/cypress/screenshots
+frontend/cypress/videos
+frontend/cypress/fixtures
 docker/*.sql
 
 # Gource

diff --git a/Makefile b/Makefile
@@ -22,4 +22,20 @@ db-migrate:
 	cd backend && export NODE_ENV=localhost && npm run db:migrate
 
 db-migrate-undo:
-	cd backend && export NODE_ENV=localhost && npm run db:migrate:undo
+	cd backend && export NODE_ENV=localhost && npm run db:migrate:undo
+
+.PHONY: db-migrate-e2e
+db-migrate-e2e:
+	cd backend && export NODE_ENV=e2etest && npm run db:migrate
+
+run-e2e-server: db-migrate-e2e
+	cd backend && export NODE_ENV=e2etest && npm run new-start & \
+	cd frontend && export NODE_ENV=e2etest && npm run build:watch
+
+test-e2e:
+	cd frontend && npx cypress run
+
+stop-containers:
+	docker stop frontend_backend
+	docker stop sfc-test
+	docker stop soprasteria-sfc-sfc-redis-1
diff --git a/backend/docker-compose.yml b/backend/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   sfc-redis:
     image: redis