Merge be60fd3 into e79fdf1

.gitignore

@@ -17,3 +17,4 @@ yarn.lock
 
 # build task results for ci
 coverage/
+.nyc_output/

.travis.yml

@@ -4,6 +4,7 @@ language: node_js
 node_js:
    - '8'
    - '10'
+   - '12'
    - "lts/*"                # Active LTS release
    - "node"                 # Latest stable release
 after_success:

Makefile

@@ -24,7 +24,7 @@ YARN		:= yarn
 NPM		:= npm
 COVERALLS	:= $(NODE_BIN)/coveralls
 ESLINT		:= $(NODE_BIN)/eslint
-ISTANBUL	:= $(NODE_BIN)/istanbul
+ISTANBUL	:= $(NODE_BIN)/nyc
 MOCHA		:= $(NODE_BIN)/mocha
 _MOCHA		:= $(NODE_BIN)/_mocha
 UNLEASH		:= $(NODE_BIN)/unleash
@@ -100,12 +100,12 @@ test: $(NODE_MODULES) ## Run unit tests
 
 .PHONY: coverage
 coverage: $(NODE_MODULES) clean-coverage ## Generate test coverage
-	@$(ISTANBUL) cover $(_MOCHA) --report lcovonly -- -R spec
+	@$(ISTANBUL) --report lcovonly $(_MOCHA) -R spec
 
 
 .PHONY: report-coverage
 report-coverage: $(NODE_MODULES) coverage ## Report test coverage to Coveralls
-	@cat $(LCOV) | $(COVERALLS)
+	$(ISTANBUL) report --reporter=text-lcov | $(COVERALLS)
 
 
 .PHONY: clean-coverage

README.md

@@ -5,7 +5,6 @@
 [![Coverage Status](https://coveralls.io/repos/restify/errors/badge.svg?branch=master)](https://coveralls.io/r/restify/errors?branch=master)
 [![Dependency Status](https://david-dm.org/restify/errors.svg)](https://david-dm.org/restify/errors)
 [![devDependency Status](https://david-dm.org/restify/errors/dev-status.svg)](https://david-dm.org/restify/errors#info=devDependencies)
-[![bitHound Score](https://www.bithound.io/github/restify/errors/badges/score.svg)](https://www.bithound.io/github/restify/errors/master)
 
 > A collection of HTTP and REST Error constructors.
 

lib/baseClasses/HttpError.js

@@ -90,7 +90,7 @@ function HttpError() {
      * @property
      * @type {Function}
      */
-    if (opts.hasOwnProperty('toJSON')) {
+    if (Object.prototype.hasOwnProperty.call(opts, 'toJSON')) {
         self.toJSON = opts.toJSON;
     }
 
@@ -100,7 +100,7 @@ function HttpError() {
      * @property
      * @type {Function}
      */
-    if (opts.hasOwnProperty('toString')) {
+    if (Object.prototype.hasOwnProperty.call(opts, 'toString')) {
         self.toString = opts.toString;
     }
 }

lib/helpers.js

@@ -46,7 +46,7 @@ function parseVErrorArgs(ctorArgs) {
     if (_.isPlainObject(args[0])) {
         // split restify-errors options from verror options
         _.forOwn(args[0], function(val, key) {
-            if (INTERNAL_OPTS_KEYS.hasOwnProperty(key)) {
+            if (Object.prototype.hasOwnProperty.call(INTERNAL_OPTS_KEYS, key)) {
                 internalOpts[key] = val;
             } else {
                 verrorOpts[key] = val;

package.json

@@ -35,24 +35,24 @@
     "test": "make test"
   },
   "devDependencies": {
-    "bunyan": "^1.8.10",
+    "bunyan": "^1.8.12",
     "chai": "^4.2.0",
-    "conventional-changelog-angular": "^5.0.0",
-    "conventional-recommended-bump": "^4.0.0",
-    "coveralls": "^3.0.3",
-    "eslint": "^5.16.0",
-    "istanbul": "^0.4.5",
+    "conventional-changelog-angular": "^5.0.6",
+    "conventional-recommended-bump": "^6.0.5",
+    "coveralls": "^3.0.9",
+    "eslint": "^6.7.2",
     "mkdirp": "^0.5.1",
-    "mocha": "^6.1.4",
-    "restify": "^8.3.1",
-    "restify-clients": "^2.6.4",
+    "mocha": "^6.2.2",
+    "nyc": "^14.1.1",
+    "restify": "^8.5.0",
+    "restify-clients": "^2.6.7",
     "unleash": "^2.0.1"
   },
   "optionalDependencies": {
-    "safe-json-stringify": "^1.0.4"
+    "safe-json-stringify": "^1.2.0"
   },
   "dependencies": {
-    "@netflix/nerror": "^1.0.0",
+    "@netflix/nerror": "^1.1.3",
     "assert-plus": "^1.0.0",
     "lodash": "^4.17.15"
   }