Skip to content

Commit 7105ba8

Browse files
update scripts
1 parent 2053b0f commit 7105ba8

File tree

3 files changed

+9
-45
lines changed

3 files changed

+9
-45
lines changed

.github/workflows/node.js.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ name: Node.js CI
55

66
on:
77
push:
8-
branches:
9-
- 'main'
10-
# TODO: 4.1 included temporarily to test out github workflow
11-
- '4.1'
8+
branches: ['main']
129
pull_request:
1310
branches: ['main']
1411

@@ -36,7 +33,7 @@ jobs:
3633
USER_DB_URL: ${{secrets.USER_DB_URL}}
3734
SSL_KEY: ${{secrets.SSL_KEY}}
3835
SSL_CERT: ${{secrets.SSL_CERT}}
39-
run: npm start
36+
run: npm run start:test
4037
- name: Run test suites
4138
env:
4239
MYSQL_TEST_URL: ${{secrets.MYSQL_TEST_URL}}

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,16 @@
99
},
1010
"scripts": {
1111
"seed": "ts-node ./server/seed/seed.ts",
12-
"start": "cross-env NODE_ENV=production ts-node server/server.ts &",
12+
"start": "cross-env NODE_ENV=production ts-node server/server.ts",
13+
"start:test": "cross-env NODE_ENV=test ts-node server/server.ts &",
1314
"build": "vite build",
1415
"dev": "concurrently \"vite serve\" \"nodemon --exec 'ts-node' server/server.ts\"",
1516
"preview": "vite preview",
16-
"test": "cross-env NODE_ENV=test jest --verbose --detectOpenHandles",
17-
"cert": "rm -rf .cert && mkdir -p .cert && mkcert -key-file ./.cert/key.pem -cert-file ./.cert/cert.pem localhost",
18-
"linux-cert": "rm -rf .cert && mkdir -p .cert && cd .cert && mkcert create-ca && mkcert create-cert --key key.pem --cert cert.pem",
19-
"watch": "jest --watch",
17+
"test": "cross-env NODE_ENV=test jest",
18+
"test:verbose": "cross-env NODE_ENV=test jest --verbose --detectOpenHandles",
19+
"test:watch": "jest --watch",
20+
"cert:mac": "rm -rf .cert && mkdir -p .cert && mkcert -key-file ./.cert/key.pem -cert-file ./.cert/cert.pem localhost",
21+
"cert:linux": "rm -rf .cert && mkdir -p .cert && cd .cert && mkcert create-ca && mkcert create-cert --key key.pem --cert cert.pem",
2022
"e2e": "cypress open --project ./tests"
2123
},
2224
"author": "Steven Geiger, Michael Costello, Alexander Tu, Yufa Li",

tests/cypress/e2e/spec.cy.js

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)