Merge pull request #20 from Jyrno42/error-handling-bugfix

BugFixes: Error handling

.gitignore

@@ -8,5 +8,5 @@ tmp
 coverage
 .nyc_output
 npm-debug.log
-es/
+es
 .vscode

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-resources",
-  "version": "2.0.0-alpha.2",
+  "version": "2.0.0-alpha.3",
   "description": "Abstractions on-top of `superagent` (or other Ajax libaries) for communication with REST.",
   "main": "./dist/index.js",
   "jsnext:main": "./es/index.js",

src/base.js

@@ -122,10 +122,7 @@ class GenericResource {
                 } else if (this.config.statusValidationError.indexOf(res.status) !== -1) {
                     // Got statusValidationError response code, lets throw RequestValidationError
                     throw this.mutateError(
-                        new RequestValidationError({
-                            statusCode: res.status,
-                            responseText: res.text,
-                        }, this.config),
+                        new RequestValidationError(res.status, res.text, this.config),
                         res,
                     );
                 } else {

src/constants.js

@@ -1,4 +1,4 @@
-import { defaultParseErrors, defaultPrepareError } from './validationError';
+import { parseErrors, prepareError } from './validationError';
 
 
 const DEFAULTS = {
@@ -9,8 +9,8 @@ const DEFAULTS = {
     headers: null,
     cookies: null,
 
-    parseErrors: defaultParseErrors,
-    prepareError: defaultPrepareError,
+    parseErrors,
+    prepareError,
 
     statusSuccess: [200, 201, 204],
     statusValidationError: [400],

test-server.js

@@ -141,4 +141,12 @@ app.delete('/dogs/:id', (req, res) => {
     }
 });
 
+app.post('/error400', (req, res) => {
+    res.status(400).json({
+        'name': [
+            'This field is required.'
+        ]
+    });
+});
+
 export default () => app.listen(port);

test/functional.js

@@ -3,7 +3,7 @@ import { spy } from 'sinon';
 
 import listen from '../test-server';
 
-import { Resource, Response } from '../src';
+import { Resource, Response, RequestValidationError } from '../src';
 import { isSubClass } from '../src/typeChecks';
 
 
@@ -345,5 +345,30 @@ export default {
                 }, done);
             });
         },
+
+        'statusValidationError is handled properly': (done) => {
+            const res = new Resource('/error400', {
+                apiRoot: 'http://127.0.0.1:3000',
+            });
+
+            res.post(null, { name: '' }).then(() => {
+                done(new Error('Expected request to fail'));
+            }, (err) => {
+                // the error must RequestValidationError
+                expect(err).to.be.an.instanceof(RequestValidationError);
+
+                // statusCode must be correct
+                expect(err.statusCode).to.equal(400);
+
+                // hasError must be true
+                expect(err.hasError()).to.be.equal(true);
+
+                // errors should be correct
+                expect(err.errors.toString()).to.equal('name: This field is required.');
+
+                // all good
+                done();
+            }).catch(done);
+        },
     },
 };