Separate CI tasks and fix cwd

S-YOU · Jul 29, 2019 · 58bb3d4 · 58bb3d4
1 parent e8c417d
commit 58bb3d4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/azure-pipelines-template.yml b/azure-pipelines-template.yml
@@ -45,8 +45,10 @@ jobs:
       # https://yarnpkg.com/lang/en/docs/cli/install/#toc-yarn-install-frozen-lockfile
       - script: yarn --frozen-lockfile
         displayName: 'Install dependencies'
-      - script: yarn test-ci
-        displayName: 'Run tests'
+      - script: yarn test:unit
+        displayName: 'Run unit tests'
+      - script: yarn test:integration-ci
+        displayName: 'Run integration tests'
       - script: yarn flow
         displayName: 'Type check with Flow'
       - script: yarn lint

diff --git a/package.json b/package.json
@@ -19,10 +19,9 @@
     "precommit": "lint-staged",
     "prepublishOnly": "yarn build",
     "test:unit": "cross-env NODE_ENV=test mocha --config unit.mocharc.json",
-    "test:integration": "(cd packages/core/integration-tests && yarn test) && mocha --config integration.mocharc.json",
-    "test:integration-ci": "(cd packages/core/integration-tests && yarn test-ci) && mocha --config integration.mocharc.json",
-    "test": "yarn test:unit && yarn test:integration",
-    "test-ci": "yarn test:unit && yarn test:integration-ci"
+    "test:integration": "mocha --config integration.mocharc.json && (pushd packages/core/integration-tests && yarn test && popd)",
+    "test:integration-ci": "mocha --config integration.mocharc.json && (pushd packages/core/integration-tests && yarn test-ci && popd)",
+    "test": "yarn test:unit && yarn test:integration"
   },
   "devDependencies": {
     "eslint": "^5.16.0",