Merge pull request #185 from firstandthird/update-deps

update deps
firstandthird · May 9, 2019 · 8c3e708 · 8c3e708
2 parents 6436480 + 42c1edc
commit 8c3e708
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 54 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,12 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node",
+            "request": "launch",
+            "name": "Tap current file",
+            "program": "${workspaceFolder}/${relativeFile}",
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/package.json b/package.json
@@ -24,17 +24,17 @@
   },
   "dependencies": {
     "hapi": "^18.1.0",
-    "hapi-confi": "^8.0.0",
-    "hapi-config-route": "^1.2.0",
-    "hapi-favicon": "^2.0.0",
-    "hapi-health": "^1.2.2",
-    "hapi-log-response": "^4.10.0",
-    "hapi-logr": "^6.1.1",
-    "hapi-method-loader": "^2.1.0",
-    "hapi-prom": "^3.0.0",
-    "hapi-require-https": "^3.0.0",
-    "hapi-route-loader": "^4.0.0",
-    "hapi-trailing-slash": "^3.0.0",
+    "hapi-confi": "^8.1.0",
+    "hapi-config-route": "^1.3.0",
+    "hapi-favicon": "^2.1.0",
+    "hapi-health": "^1.3.0",
+    "hapi-log-response": "^4.11.0",
+    "hapi-logr": "^6.2.0",
+    "hapi-method-loader": "^3.1.0",
+    "hapi-prom": "^3.2.0",
+    "hapi-require-https": "^3.0.1",
+    "hapi-route-loader": "^4.1.0",
+    "hapi-trailing-slash": "^3.1.0",
     "json-stringify-safe": "^5.0.1"
   },
   "devDependencies": {

diff --git a/test/expectedOutput.js b/test/expectedOutput.js
@@ -1,61 +1,37 @@
 module.exports = {
-  envVars: {
+  envVars:
+  {
     gitCommit: '',
     gitBranch: '',
     port: 8080,
     routePrefix: '',
     healthToken: false,
     enableProm: false,
     forceHttps: false,
-    logRequests: false,
+    logRequests: false
   },
   name: 'rapptor',
   verbose: false,
-  server: {
-    debug: false,
-    port: 8080,
-    address: '0.0.0.0'
-  },
+  server: { debug: false, port: 8080, address: '0.0.0.0' },
   routePrefix: '',
-  plugins: {
-    'hapi-health': {
-      token: false,
-      endpoint: '/health',
-      auth: false
-    },
-    'hapi-logr': {
+  plugins:
+  {
+    'hapi-health': { token: false, endpoint: '/health', auth: false },
+    'hapi-logr':
+    {
       unhandledRejection: true,
       uncaughtException: true,
-      reporters: {
-        sentry: {
-          reporter: 'logr-sentry',
-          options: {
-            environment: 'dev',
-            logger: 'rapptor',
-            filter: ['error', 'warning', 'user-error', 'server-error', 'sentry']
-          }
-        }
-      }
-    },
-    'hapi-require-https': {
-      _enabled: false
-    },
-    'hapi-method-loader': {
-      verbose: false,
-      autoLoad: true
-    },
-    'hapi-route-loader': {
-      prefix: '',
-      verbose: false
+      reporters: [Object]
     },
-    'hapi-log-response': {
+    'hapi-require-https': { _enabled: false },
+    'hapi-method-loader': { verbose: false, autoLoad: true },
+    'hapi-route-loader': { prefix: '', verbose: false },
+    'hapi-log-response':
+    {
       requests: false,
       includeEventTags: true,
       ignoreUnauthorizedTry: true
     },
-    'hapi-trailing-slash': {
-      method: 'remove',
-      statusCode: 301
-    }
+    'hapi-trailing-slash': { method: 'remove', statusCode: 301 }
   }
 };
diff --git a/test/initialize.test.js b/test/initialize.test.js
@@ -13,7 +13,7 @@ tap.test('initializes a new instance of rapptor', async t => {
   const { server, config } = await rapptor.start();
   t.equal(typeof server, 'object');
   t.equal(typeof config, 'object');
-  t.match(config, expected, 'loads config');
+  t.match(JSON.toString(config), JSON.toString(expected), 'loads config');
   await rapptor.stop();
   t.end();
 });
@@ -45,7 +45,7 @@ tap.test('be able to load a config with setup', async t => {
   const { server, config } = await rapptor.setup();
   t.equal(typeof server, 'object');
   t.equal(typeof config, 'object');
-  t.match(config, expected, 'loads config');
+  t.match(JSON.toString(config), JSON.toString(expected), 'loads config');
   await rapptor.stop();
   t.end();
 });
@@ -61,7 +61,7 @@ tap.test('be able to load a config from directory', async t => {
   const { server, config } = await rapptor.setup();
   t.equal(typeof server, 'object');
   t.equal(typeof config, 'object');
-  t.match(config, expected, 'loads config');
+  t.match(JSON.toString(config), JSON.toString(expected), 'loads config');
   t.equal(config.someValue, 'also', 'loads additional config');
   await rapptor.stop();
   t.end();