Remove eslint-disable-X

hapi-swagger · Nov 10, 2019 · 7690729 · 7690729
1 parent 7fb9e48
commit 7690729
Show file tree

Hide file tree

Showing 3 changed files with 64 additions and 79 deletions.
diff --git a/examples/custom.js b/examples/custom.js
@@ -86,41 +86,36 @@ let swaggerOptions = {
 };
 
 const ser = async () => {
-  // eslint-disable-next-line no-useless-catch
-  try {
-    const server = Hapi.Server({
-      host: 'localhost',
-      port: 3000
-    });
+  const server = Hapi.Server({
+    host: 'localhost',
+    port: 3000
+  });
 
-    // Blipp and Good - Needs updating for Hapi v17.x
-    await server.register([
-      Inert,
-      Vision,
-      Blipp,
-      {
-        plugin: Good,
-        options: goodOptions
-      },
-      {
-        plugin: HapiSwagger,
-        options: swaggerOptions
-      }
-    ]);
+  // Blipp and Good - Needs updating for Hapi v17.x
+  await server.register([
+    Inert,
+    Vision,
+    Blipp,
+    {
+      plugin: Good,
+      options: goodOptions
+    },
+    {
+      plugin: HapiSwagger,
+      options: swaggerOptions
+    }
+  ]);
 
-    server.route(Routes);
+  server.route(Routes);
 
-    server.views({
-      path: 'examples/assets',
-      engines: { html: require('handlebars') },
-      isCached: false
-    });
+  server.views({
+    path: 'examples/assets',
+    engines: { html: require('handlebars') },
+    isCached: false
+  });
 
-    await server.start();
-    return server;
-  } catch (err) {
-    throw err;
-  }
+  await server.start();
+  return server;
 };
 
 ser()

diff --git a/lib/properties.js b/lib/properties.js
@@ -367,8 +367,7 @@ internals.properties.prototype.parseDate = function(property, joiObj) {
 internals.properties.prototype.parseObject = function(property, joiObj, name, parameterType, useDefinitions, isAlt) {
   property.properties = {};
 
-  // eslint-disable-next-line no-unused-vars
-  joiObj._ids._byKey.forEach((obj, key) => {
+  joiObj._ids._byKey.forEach((obj) => {
     let keyName = obj.id;
     let itemName = obj.id;
     let joiChildObj = obj.schema;

diff --git a/test/helper.js b/test/helper.js
@@ -19,27 +19,22 @@ const helper = (module.exports = {});
 helper.createServer = async (swaggerOptions, routes, serverOptions = {}) => {
   const server = new Hapi.Server(serverOptions);
 
-  // eslint-disable-next-line no-useless-catch
-  try {
-    await server.register([
-      Inert,
-      Vision,
-      H2o2,
-      {
-        plugin: HapiSwagger,
-        options: swaggerOptions
-      }
-    ]);
-
-    if (routes) {
-      server.route(routes);
+  await server.register([
+    Inert,
+    Vision,
+    H2o2,
+    {
+      plugin: HapiSwagger,
+      options: swaggerOptions
     }
+  ]);
 
-    await server.start();
-    return server;
-  } catch (e) {
-    throw e;
+  if (routes) {
+    server.route(routes);
   }
+
+  await server.start();
+  return server;
 };
 
 /**
@@ -52,38 +47,34 @@ helper.createServer = async (swaggerOptions, routes, serverOptions = {}) => {
 helper.createServerMultiple = async (swaggerOptions1, swaggerOptions2, routes, serverOptions = {}) => {
   const server = new Hapi.Server(serverOptions);
 
-  try {
-    await server.register([
-      Inert,
-      Vision,
-      H2o2,
-    ]);
-
-    await server.register({
-      plugin: HapiSwagger,
-      options: swaggerOptions1,
-    },
-    {
-      routes: { prefix: '/' + swaggerOptions1.routeTag || 'api1', }
-    });
+  await server.register([
+    Inert,
+    Vision,
+    H2o2,
+  ]);
 
-    await server.register({
-      plugin: HapiSwagger,
-      options: swaggerOptions2,
-    },
-    {
-      routes: { prefix: '/' + swaggerOptions2.routeTag || 'api2', }
-    });
+  await server.register({
+    plugin: HapiSwagger,
+    options: swaggerOptions1,
+  },
+  {
+    routes: { prefix: '/' + swaggerOptions1.routeTag || 'api1', }
+  });
 
-    if (routes) {
-      server.route(routes);
-    }
+  await server.register({
+    plugin: HapiSwagger,
+    options: swaggerOptions2,
+  },
+  {
+    routes: { prefix: '/' + swaggerOptions2.routeTag || 'api2', }
+  });
 
-    await server.start();
-    return server;
-  } catch (e) {
-    throw e;
+  if (routes) {
+    server.route(routes);
   }
+
+  await server.start();
+  return server;
 };
 
 /**