orator 2.0.8 → 2.0.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orator",
-  "version": "2.0.8",
+  "version": "2.0.10",
   "description": "Restful web API server. Using restify 6.",
   "main": "source/Orator.js",
   "scripts": {
@@ -28,6 +28,24 @@
   "bugs": {
     "url": "https://github.com/stevenvelozo/orator/issues"
   },
+  "mocha": {
+      "diff": true,
+      "extension": [
+          "js"
+      ],
+      "package": "./package.json",
+      "reporter": "spec",
+      "slow": "75",
+      "timeout": "5000",
+      "ui": "tdd",
+      "watch-files": [
+          "source/**/*.js",
+          "test/**/*.js"
+      ],
+      "watch-ignore": [
+          "lib/vendor"
+      ]
+  },
   "homepage": "https://github.com/stevenvelozo/orator",
   "devDependencies": {
     "async": "2.6.1",

package/source/Orator.js

@@ -610,9 +610,9 @@ var Orator = function()
 		var handleError = function(req, res, err, callback)
 		{
 			// allow application to customize this error handling
-			if (typeof userUnhandledErrorHandler == 'function' && !userUnhandledErrorHandler(req, res, err))
+			if (typeof userUnhandledErrorHandler == 'function' && !userUnhandledErrorHandler(req, res, err, callback))
 			{
-				return callback();
+				return;
 			}
 			//the default for a string error is 'Route not found', though it isn't accurate
 			err.message = err.message.replace('Route not found: ', '');

package/test/Orator-proxy_tests.js

@@ -146,13 +146,13 @@ suite
 					function(fDone)
 					{
 						libSuperTest('http://localhost:' + _MockSettings.APIServerPort + '/')
-						.get('google/search?q=laser+shark')
+						.get('google/a')
 						.end(
 							function (pError, pResponse)
 							{
 								//check for google search result
 								Expect(pResponse.text)
-									.to.contain('laser shark');
+									.to.contain('google');
 								return fDone();
 							}
 						);

package/test/Orator_basic_tests.js

@@ -29,17 +29,19 @@ suite
 		let capturedReq = null;
 		let capturedRes = null;
 		let capturedErr = null;
+		let capturedCallback = null;
 
 		setup
 		(
 			function()
 			{
 				_Orator = require('../source/Orator.js').new(_MockSettings);
-				_Orator.registerUnhandledErrorHandler((req, res, err) =>
+				_Orator.registerUnhandledErrorHandler((req, res, err, callback) =>
 				{
 					capturedReq = req;
 					capturedRes = res;
 					capturedErr = err;
+					capturedCallback = callback;
 					return err.statusCode > 0;
 				});
 				_Orator.registerErrorTransformer((err) =>
@@ -265,7 +267,7 @@ suite
 								Expect(capturedReq).to.exist; // shows we called the custom error handler
 								Expect(capturedReq.RequestUUID).to.be.a('string'); // so we can log this from the handler
 								Expect(capturedRes).to.exist; // shows we called the custom error handler
-								Expect(capturedErr.message).to.contain('Cannot read property \'dog\'');
+								Expect(capturedErr.message).to.contain('Cannot read properties of null (reading \'dog\')');
 								Expect(pResponse.text).to.contain('Cannot read property \'dog\'');
 
 								return fDone();
@@ -291,6 +293,7 @@ suite
 								Expect(capturedReq).to.exist; // shows we called the custom error handler
 								Expect(capturedReq.RequestUUID).to.be.a('string'); // so we can log this from the handler
 								Expect(capturedRes).to.exist; // shows we called the custom error handler
+								Expect(capturedCallback).to.be.a('function');
 								Expect(capturedErr.message).to.contain('Cannot read property \'dog\'');
 								Expect(pResponse.text).to.contain('Cannot read property \'dog\'');