test: fix tests

package.json

@@ -13,7 +13,8 @@
     "devDependencies": {
         "@dhis2/cli-style": "3.3.4",
         "husky": "^2.4.1",
-        "tape": "^4.10.2"
+        "tape": "^4.10.2",
+        "tape-await": "^0.1.2"
     },
     "husky": {
         "hooks": {

packages/cluster/tests/setup-environment.js

@@ -1,19 +1,24 @@
-const test = require('tape')
+const test = require('tape-await')
 
 const { makeEnvironment, resolveConfiguration } = require('../src/common.js')
 
 const defaults = require('../src/defaults.js')
 
-test('build runtime environment based on defaults', function(t) {
+const cache = obj => ({
+    read: () => JSON.stringify(obj),
+    write: () => {},
+})
+
+test('build runtime environment based on defaults', async function(t) {
     t.plan(1)
 
     const argv = {
         name: 'dev',
+        getCache: () => cache(null),
     }
-    const cache = {}
-    const config = {}
 
-    const actual = makeEnvironment(resolveConfiguration(argv, cache, config))
+    const cfg = await resolveConfiguration(argv)
+    const actual = makeEnvironment(cfg)
 
     const expected = {
         DHIS2_CORE_NAME: 'dev',
@@ -27,7 +32,7 @@ test('build runtime environment based on defaults', function(t) {
     t.deepEqual(actual, expected, 'default environment')
 })
 
-test('build runtime environment based on args', function(t) {
+test('build runtime environment based on args', async function(t) {
     t.plan(1)
 
     const argv = {
@@ -38,11 +43,11 @@ test('build runtime environment based on args', function(t) {
         channel: 'canary',
         variant: 'jetty-slackware',
         port: 8233,
+        getCache: () => cache(null),
     }
-    const cache = {}
-    const config = {}
 
-    const actual = makeEnvironment(resolveConfiguration(argv, cache, config))
+    const cfg = await resolveConfiguration(argv)
+    const actual = makeEnvironment(cfg)
 
     const expected = {
         DHIS2_CORE_NAME: 'dev',
@@ -56,24 +61,25 @@ test('build runtime environment based on args', function(t) {
     t.deepEqual(actual, expected, 'args environment')
 })
 
-test('build runtime environment based on mixed args and config', function(t) {
+test('build runtime environment based on mixed args and config', async function(t) {
     t.plan(1)
 
-    const argv = {
-        name: 'mydev',
-        customContext: true,
-    }
-
-    const cache = {}
-
     const config = {
         dhis2Version: 'master',
         port: 8233,
         channel: 'dev',
         dbVersion: 'dev',
     }
 
-    const actual = makeEnvironment(resolveConfiguration(argv, cache, config))
+    const argv = {
+        name: 'mydev',
+        customContext: true,
+        cluster: config,
+        getCache: () => cache(null),
+    }
+
+    const cfg = await resolveConfiguration(argv)
+    const actual = makeEnvironment(cfg)
 
     const expected = {
         DHIS2_CORE_NAME: 'mydev',
@@ -87,24 +93,26 @@ test('build runtime environment based on mixed args and config', function(t) {
     t.deepEqual(actual, expected, 'args and config environment')
 })
 
-test('build runtime environment based on mixed args, cache, config and defaults', function(t) {
+test('build runtime environment based on mixed args, cache, config and defaults', async function(t) {
     t.plan(1)
 
-    const argv = {
-        name: 'mydev',
-    }
-
-    const cache = {
-        customContext: true,
-        image: 'dhis2/core-canary:master-20190523-alpine',
-    }
-
     const config = {
         port: 8233,
         dhis2Version: 'dev',
     }
 
-    const actual = makeEnvironment(resolveConfiguration(argv, cache, config))
+    const argv = {
+        name: 'mydev',
+        cluster: config,
+        getCache: () =>
+            cache({
+                customContext: true,
+                image: 'dhis2/core-canary:master-20190523-alpine',
+            }),
+    }
+
+    const cfg = await resolveConfiguration(argv)
+    const actual = makeEnvironment(cfg)
 
     const expected = {
         DHIS2_CORE_NAME: 'mydev',

yarn.lock

@@ -4735,6 +4735,11 @@ table@^5.2.3:
     slice-ansi "^2.1.0"
     string-width "^3.0.0"
 
+tape-await@^0.1.2:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/tape-await/-/tape-await-0.1.2.tgz#41f99110a2bc4728732d8bc058278b2fbf3c0bec"
+  integrity sha512-Gt1bXilp9uRTVj+DecLDs37tP1XwGXfFzWVqQEfW7foO9TNacy+aN5TdT0Kv6LI5t/9l3iOE4nX2hr2SQ4+OSg==
+
 tape@^4.10.2:
   version "4.10.2"
   resolved "https://registry.yarnpkg.com/tape/-/tape-4.10.2.tgz#129fcf62f86df92687036a52cce7b8ddcaffd7a6"