Merge pull request #2180 from overleaf/as-clean-up-makefile

Clean up how tests are run in Makefile

GitOrigin-RevId: 9b52ead16392cca09bdf7edc4365f10dc468ccf2
This commit is contained in:
Eric Mc Sween
2019-10-23 12:58:39 +00:00
committed by sharelatex
parent 9902edcfbb
commit 082f790fb6
8 changed files with 82 additions and 63 deletions
+3 -2
View File
@@ -9,7 +9,7 @@ services:
build: .
image: ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER
user: node
command: npm run test:unit:ci
command: npm run test:unit:app
test_acceptance:
build: .
@@ -22,8 +22,9 @@ services:
PROJECT_HISTORY_ENABLED: 'true'
ENABLED_LINKED_FILE_TYPES: 'url,project_file,project_output_file,mendeley,zotero'
LINKED_URL_PROXY: 'http://localhost:6543'
SHARELATEX_CONFIG: /app/test/acceptance/config/settings.test.coffee
NODE_ENV: test
SHARELATEX_CONFIG:
command: npm run test:acceptance:app
user: root
depends_on:
- redis