Merge branch 'master' into release-cb7342c5c19bfbc2f4f253e7ada9f9ff90…

…9594d1
kubeflow · Jan 6, 2020 · a13c2c3 · a13c2c3
2 parents 6cc6087 + 8d21f81
commit a13c2c3
Show file tree

Hide file tree

Showing 39 changed files with 8,236 additions and 2,102 deletions.
diff --git a/frontend/.gitignore b/frontend/.gitignore
@@ -24,3 +24,9 @@ backstop_data/bitmaps_test/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+
+# coverage reports
+coverage
+
+# vscode
+.vscode
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -55,9 +55,10 @@
     "start:proxy-standalone-and-server": "./start-proxy-standalone-and-server.sh",
     "start": "react-scripts-ts start",
     "test": "react-scripts-ts test --env=jsdom",
+    "test:server": "cd ./server && npm test && cd ..",
     "test:coverage": "npm test -- --env=jsdom --coverage",
     "test:ci": "npm run format:check && npm run lint && npm run test:coverage",
-    "test:ci:prow": "npm set unsafe-perm true && npm ci && npm run test:ci && ./scripts/report-coveralls.sh",
+    "test:ci:prow": "npm set unsafe-perm true && npm ci && npm run test:ci && ./scripts/report-coveralls.sh && npm run test:server",
     "vr-approve": "backstop approve",
     "vr-test": "ts-node -O '{\"module\": \"commonjs\"}' backstop.ts"
   },
@@ -74,7 +75,7 @@
     "@types/js-yaml": "^3.11.2",
     "@types/lodash": ">=4.14.117",
     "@types/markdown-to-jsx": "^6.9.0",
-    "@types/node": "^10.10.1",
+    "@types/node": "^10.17.11",
     "@types/react": "^16.7.18",
     "@types/react-dom": "^16.0.7",
     "@types/react-router-dom": "^4.3.1",