[server] enhanced mocha setups

.gitpod.yml

@@ -82,3 +82,4 @@ vscode:
         - dbaeumer.vscode-eslint
         - esbenp.prettier-vscode
         - akosyakov.gitpod-monitor
+        - hbenl.vscode-mocha-test-adapter

components/gitpod-db/src/config.ts

@@ -15,7 +15,7 @@ export class Config {
         // defaults to be used only in tests
         const dbSetup: DatabaseConfig = {
             host: process.env.DB_HOST || "localhost",
-            port: getEnvVarParsed("DB_PORT", Number.parseInt, "3306"),
+            port: getEnvVarParsed("DB_PORT", Number.parseInt, "23306"),
             username: process.env.DB_USERNAME || "gitpod",
             password: process.env.DB_PASSWORD || "test",
             database: process.env.DB_NAME || "gitpod",
@@ -50,7 +50,10 @@ export class Config {
     }
 
     get dbEncryptionKeys(): string {
-        return getEnvVar("DB_ENCRYPTION_KEYS");
+        return getEnvVar(
+            "DB_ENCRYPTION_KEYS",
+            `[{"name":"general","version":1,"primary":true,"material":"5vRrp0H4oRgdkPnX1qQcS54Q0xggr6iyho42IQ1rO+c="}]`,
+        );
     }
 }
 

components/server/.vscode/settings.json

@@ -0,0 +1,16 @@
+{
+    "mochaExplorer.files": [
+        "dist/**/*.spec.js",
+        "dist/**/*.spec.db.js"
+    ],
+    "mochaExplorer.require": [
+        "source-map-support/register",
+        "reflect-metadata/Reflect"
+    ],
+    "mochaExplorer.watch": [
+        "dist/**/*.spec.js",
+        "dist/**/*.spec.db.js"
+    ],
+    "mochaExplorer.exit": true,
+    "mochaExplorer.timeout": 60000
+}

components/server/BUILD.yaml

@@ -3,7 +3,6 @@ packages:
     type: yarn
     srcs:
       - "src/**"
-      - "typings/**"
       - "test/**"
       - .eslintrc
       - package.json
@@ -24,6 +23,10 @@ packages:
       packaging: offline-mirror
       yarnLock: ${coreYarnLockBase}/yarn.lock
       tsconfig: tsconfig.json
+      commands:
+        # leeway executes the build and test step in the wrong order, so we have to switch them here
+        test: ["yarn", "build"]
+        build: ["yarn", "test"]
   - name: docker
     type: docker
     deps:

components/server/mocha.opts

@@ -1,6 +1,5 @@
---require ts-node/register
 --require reflect-metadata/Reflect
 --require source-map-support/register
 --reporter spec
---watch-extensions ts
---exit
+--watch-extensions js
+--exit

components/server/package.json

@@ -18,8 +18,8 @@
     "clean:node": "rimraf node_modules",
     "purge": "yarn clean && yarn clean:node && yarn run rimraf yarn.lock",
     "test": "cleanup() { echo 'Cleanup started'; yarn stop-services; }; trap cleanup EXIT; yarn test:unit && yarn start-services && yarn test:db",
-    "test:unit": "TS_NODE_FILES=true mocha --opts mocha.opts './**/*.spec.ts' --exclude './node_modules/**'",
-    "test:db": ". $(leeway run components/gitpod-db:db-test-env) && TS_NODE_FILES=true mocha --opts mocha.opts './**/*.spec.db.ts' --exclude './node_modules/**'",
+    "test:unit": "mocha --opts mocha.opts './**/*.spec.js' --exclude './node_modules/**'",
+    "test:db": ". $(leeway run components/gitpod-db:db-test-env) && mocha --opts mocha.opts './**/*.spec.db.js'  --exclude './node_modules/**'",
     "start-services": "yarn start-testdb && yarn start-redis && yarn start-spicedb",
     "stop-services": "yarn stop-redis && yarn stop-spicedb",
     "start-testdb": "if netstat -tuln | grep ':23306 '; then echo 'Mysql is already running.'; else leeway run components/gitpod-db:init-testdb; fi",