mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-21 20:47:08 -05:00
Convert frontend test runs to use Docker/karma
This commit is contained in:
parent
ff7e016227
commit
24ec7b77ab
3 changed files with 4 additions and 9 deletions
|
@ -181,8 +181,9 @@ test: test_unit test_frontend test_acceptance
|
||||||
test_unit:
|
test_unit:
|
||||||
npm -q run test:unit -- ${MOCHA_ARGS}
|
npm -q run test:unit -- ${MOCHA_ARGS}
|
||||||
|
|
||||||
test_frontend:
|
test_frontend: test_clean # stop service
|
||||||
npm -q run test:frontend -- ${MOCHA_ARGS}
|
$(MAKE) compile
|
||||||
|
docker-compose ${DOCKER_COMPOSE_FLAGS} up test_frontend
|
||||||
|
|
||||||
test_acceptance: test_acceptance_app test_acceptance_modules
|
test_acceptance: test_acceptance_app test_acceptance_modules
|
||||||
|
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
#!/bin/bash
|
|
||||||
set -e;
|
|
||||||
MOCHA="node_modules/.bin/mocha --recursive --reporter spec"
|
|
||||||
$MOCHA "$@" test/unit_frontend/js
|
|
||||||
|
|
|
@ -15,8 +15,7 @@
|
||||||
"test:acceptance:dir": "npm -q run test:acceptance:wait_for_app && npm -q run test:acceptance:run -- $@",
|
"test:acceptance:dir": "npm -q run test:acceptance:wait_for_app && npm -q run test:acceptance:run -- $@",
|
||||||
"test:acceptance": "npm -q run test:acceptance:dir -- $@ test/acceptance/js",
|
"test:acceptance": "npm -q run test:acceptance:dir -- $@ test/acceptance/js",
|
||||||
"test:unit": "npm -q run compile && bin/unit_test $@",
|
"test:unit": "npm -q run compile && bin/unit_test $@",
|
||||||
"test:frontend": "npm -q run compile && bin/frontend_test $@",
|
"test:frontend": "karma start --single-run",
|
||||||
"test:karma": "npm -q run compile && karma start --single-run",
|
|
||||||
"compile": "make compile",
|
"compile": "make compile",
|
||||||
"start": "npm -q run compile && node app.js",
|
"start": "npm -q run compile && node app.js",
|
||||||
"nodemon": "nodemon --config nodemon.json",
|
"nodemon": "nodemon --config nodemon.json",
|
||||||
|
|
Loading…
Reference in a new issue