Fix tests

FlowFuse · Sep 4, 2024 · 0da37e8 · 0da37e8
1 parent 537ed67
commit 0da37e8
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -207,7 +207,10 @@ Please ensure the parent directory is writable, or set a different path with -d`
         return {
             AgentManager,
             webServer,
-            options
+            options: {
+                ...ConfigLoader.defaults,
+                ...options
+            }
         }
     }
     return null

diff --git a/lib/config.js b/lib/config.js
@@ -14,10 +14,19 @@ const yaml = require('yaml')
  * @property {string} [deviceVersion] - The device version
  * @property {string} [deviceDescription] - The device description
 */
+
+const defaults = {
+    port: 1880,
+    ui: false,
+    uiHost: '0.0.0.0',
+    uiPort: 1879
+}
+
 module.exports = {
     parseDeviceConfigFile,
     parseDeviceConfig,
-    config
+    config,
+    defaults
 }
 
 /**
@@ -137,13 +146,6 @@ function config (options) {
 
     const version = require('../package.json').version
 
-    const defaults = {
-        port: 1880,
-        ui: false,
-        'ui-host': '0.0.0.0',
-        'ui-port': 1879
-    }
-
     return {
         version,
         ...defaults,