Hand-fix some more ESLint errors

Author: shockey

src/helpers.js

@@ -127,14 +127,13 @@ export function normalizeSwagger(parsedSpec) {
               o.operationId = `${op}${i + 1}`
             })
           }
-          else {
-            // Ensure we always add the normalized operation ID if one already exists ( potentially different, given that we normalize our IDs)
+          else if (typeof operation.operationId !== 'undefined') {
+            // Ensure we always add the normalized operation ID if one already exists
+            // ( potentially different, given that we normalize our IDs)
             // ... _back_ to the spec. Otherwise, they might not line up
-            if (typeof operation.operationId !== 'undefined') {
-              const obj = map[op][0]
-              obj.__originalOperationId = obj.__originalOperationId || operation.operationId
-              obj.operationId = op
-            }
+            const obj = map[op][0]
+            obj.__originalOperationId = obj.__originalOperationId || operation.operationId
+            obj.operationId = op
           }
         })
       }

src/index.js

@@ -1,8 +1,8 @@
 import cloneDeep from 'lodash/cloneDeep'
 import assign from 'lodash/assign'
+import Url from 'url'
 import Http, {makeHttp, serializeRes, serializeHeaders} from './http'
 import Resolver, {clearCache} from './resolver'
-import url from 'url'
 import {makeApisTagOperation} from './interfaces'
 import {execute, buildRequest, PARAMETER_BUILDERS} from './execute'
 import {opId} from './helpers'
@@ -82,7 +82,7 @@ Swagger.prototype.applyDefaults = function () {
   const spec = this.spec
   const specUrl = this.url
   if (specUrl && specUrl.startsWith('http')) {
-    const parsed = url.parse(specUrl)
+    const parsed = Url.parse(specUrl)
     if (!spec.host) {
       spec.host = parsed.host
     }

src/interfaces.js

@@ -82,7 +82,7 @@ export function mapTagOperations({spec, cb = nullFn, defaultTag = 'default'}) {
       const cbResult = cb({spec, pathName, method, operation, operationId: id})
 
       if (operationIdCounter[id]) {
-        operationIdCounter[id] = operationIdCounter[id] + 1
+        operationIdCounter[id]++
         tagObj[`${id}${operationIdCounter[id]}`] = cbResult
       }
       else if (typeof tagObj[id] !== 'undefined') {

src/resolver.js

@@ -23,7 +23,10 @@ export function clearCache() {
   plugins.refs.clearCache()
 }
 
-export default function resolve({http, fetch, spec, url, baseDoc, mode, allowMetaPatches = true, modelPropertyMacro, parameterMacro}) {
+export default function resolve({
+  http, fetch, spec, url, baseDoc, mode, allowMetaPatches = true,
+  modelPropertyMacro, parameterMacro
+}) {
   // @TODO Swagger-UI uses baseDoc instead of url, this is to allow both
   // need to fix and pick one.
   baseDoc = baseDoc || url

src/specmap/lib/index.js

@@ -49,7 +49,7 @@ function applyPatch(obj, patch, opts) {
 
     // deepExtend doesn't merge arrays, so we will do it manually
     for (const prop in patch.value) {
-      if (patch.value.hasOwnProperty(prop)) {
+      if (Object.prototype.hasOwnProperty.call(patch.value, prop)) {
         const propVal = patch.value[prop]
         if (Array.isArray(propVal)) {
           const existing = origValPatchValue[prop] || []

src/specmap/lib/parameters.js

@@ -19,9 +19,7 @@ export default {
         }
       })
 
-      const patch = lib.replace(fullPath, val)
-
-      return patch
+      return lib.replace(fullPath, val)
     }
 
     return lib.replace(fullPath, parameters)

test/execute.js

@@ -536,8 +536,11 @@ describe('execute', () => {
         'content-type': 'multipart/form-data'
       })
 
+      // Would like to do a more thourough test ( ie: ensure the value `foo` exists..
+      // but I don't feel like attacking the interals of the node pollyfill
+      // for FormData, as it seems to be missing `.get()`)
       expect(req.url).toEqual('http://swagger.io/one')
-      expect(req.body).toBeA(FormData) // Would like to do a more thourough test ( ie: ensure the value `foo` exists.. but I don't feel like attacking the interals of the node pollyfill for FormData, as it seems to be missing `.get()`)
+      expect(req.body).toBeA(FormData)
     })
 
     it('should add content-type application/x-www-form-urlencoded when in: formData ', function () {