btwedutech/hoppscotch
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

Merge remote-tracking branch 'origin/main' into feat/user-environments

Browse Source 
# Conflicts:
#	packages/hoppscotch-backend/jest.setup.js
#	packages/hoppscotch-backend/package.json
This commit is contained in:
ankitsridhar16
2022-12-21 10:30:21 +05:30
parent c87690f378 c34379d936
commit fc2be71e1f
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/hoppscotch-backend/docker-compose.yml
View File

@@ -2,6 +2,7 @@ version: '3.0'
services: services:
local: local:
build: . build: .
command: ["pnpm", "run", "start:dev"]
environment: environment:
- PRODUCTION=false - PRODUCTION=false
- DATABASE_URL=postgresql://postgres:testpass@dev-db:5432/hoppscotch?connect_timeout=300 - DATABASE_URL=postgresql://postgres:testpass@dev-db:5432/hoppscotch?connect_timeout=300

6
packages/hoppscotch-backend/package.json
View File

@@ -18,8 +18,7 @@
"test:watch": "jest --watch", "test:watch": "jest --watch",
"test:cov": "jest --coverage", "test:cov": "jest --coverage",
"test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand", "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
"test:e2e": "jest --config ./test/jest-e2e.json", "test:e2e": "jest --config ./test/jest-e2e.json"
"postinstall": "prisma generate"
}, },
"dependencies": { "dependencies": {
"@nestjs/apollo": "^10.1.6", "@nestjs/apollo": "^10.1.6",
@@ -75,6 +74,9 @@
"ts" "ts"
], ],
"setupFilesAfterEnv": ["@relmify/jest-fp-ts"], "setupFilesAfterEnv": ["@relmify/jest-fp-ts"],
"moduleNameMapper": {
"^src/(.*)$": "<rootDir>/$1"
},
"rootDir": "src", "rootDir": "src",
"testRegex": ".*\\.spec\\.ts$", "testRegex": ".*\\.spec\\.ts$",
"transform": { "transform": {