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

Clean up how tests are run in Makefile GitOrigin-RevId: 9b52ead16392cca09bdf7edc4365f10dc468ccf2
2019-10-23 12:58:39 +00:00
parent 9902edcfbb
commit 082f790fb6
8 changed files with 82 additions and 63 deletions
@@ -12,7 +12,7 @@ services:
    working_dir: /app
    environment:
      MOCHA_GREP: ${MOCHA_GREP}
-    command: npm run test:unit
+    command: npm run test:unit:app
    user: node

  test_acceptance:
@@ -27,9 +27,10 @@ services:
      PROJECT_HISTORY_ENABLED: 'true'
      LINKED_URL_PROXY: 'http://localhost:6543'
      ENABLED_LINKED_FILE_TYPES: 'url,project_file,project_output_file,mendeley,zotero'
-      SHARELATEX_CONFIG: /app/test/acceptance/config/settings.test.coffee
      MOCHA_GREP: ${MOCHA_GREP}
      NODE_ENV: test
+      SHARELATEX_CONFIG:
+    command: npm run test:acceptance:app
    depends_on:
      - redis
      - mongo