regression and submit error test

Author: lsbardel

docs/model.md

@@ -244,9 +244,9 @@ listener:
 }
 ```
 ``data`` is an optional data to be passed to listeners while ``originModel`` is the
-model which originally triggered the evnet via ``$emit``.
-The ``$emit`` propagate through all the ancestor chain and trigger the listeners if found.
-It is possible to stopt the propagation by returning ``false``:
+model which originally triggered the event via ``$emit``.
+The ``$emit`` propagate through the ancestor chain and trigger listeners when found.
+It is possible to stop the propagation by returning ``false``:
 ```javascript
 {
     $something (data, originModel) {

src/forms/actions.js

@@ -55,19 +55,18 @@ function submit (e) {
         form.$setSubmitDone();
     } else {
         options.method = endpoint.method;
-        view.json(endpoint.url, options).then(done, error);
+        view.json(endpoint.url, options).then(done, done);
     }
 
 
     function done (response) {
         form.$setSubmitDone();
-        form.$response(response);
-    }
-
-    function error (err) {
-        form.$emit('formMessage', {
-            level: 'error',
-            message: messages[err.message] || messages.default,
-        });
+        if (response.status && response.headers)
+            form.$response(response);
+        else
+            form.$emit('formMessage', {
+                level: 'error',
+                message: messages[response.message] || messages.default,
+            });
     }
 }

test/fixtures/fetch.js

@@ -5,41 +5,49 @@ import jsonform from './jsonform';
 export default function (url, ...o) {
     if (isAbsoluteUrl(url)) url = new URL(url).pathname;
     var result = fixtures[url];
-    if (result) return Promise.resolve(result(...o));
-    else return Promise.resolve(error(404));
+    if (result) {
+        try {
+            return Promise.resolve(result(...o));
+        } catch (err) {
+            return Promise.reject(err);
+        }
+    } else return Promise.resolve(error(404));
 }
 
 
 const fixtures = {
     '/test': (o) => {
-        if (!o || o.method === 'get')
+        if (!o || o.method === 'GET')
             return asText('<p>This is a test</p>');
         else
             return error(405);
     },
     '/fake/test': (o) => {
-        if (!o || o.method === 'get')
+        if (!o || o.method === 'GET')
             return asText('<p>This is a test</p>');
         else
             return error(405);
     },
     '/submitTest': (o) => {
-        if (o.method === 'post')
+        if (o.method === 'POST')
             return asJson(o, {success: true});
         else
             return error(405);
     },
     '/sidebar': (o) => {
-        if (!o || o.method === 'get')
+        if (!o || o.method === 'GET')
             return asText(sidebar);
         else
             return error(405);
     },
     '/jsonform': (o) => {
-        if (!o || o.method === 'get')
+        if (!o || o.method === 'GET')
             return asJson(o, JSON.parse(jsonform));
         else
             return error(405);
+    },
+    '/error': () => {
+        throw new Error('error');
     }
 };
 

test/fixtures/jsonform3.js

@@ -45,7 +45,7 @@ export default JSON.stringify({
             endpoint: {
                 url: '/submitTest',
                 contentType: 'multipart/form-data',
-                method: 'put'
+                method: 'PUT'
             }
         }
     ]

test/test-form-submit.js

@@ -73,8 +73,8 @@ describe('form submit -', () => {
         //
         // test the redirect
         var submit = button.model();
-        expect(submit.endpoint.method).toBe('put');
-        submit.endpoint.method = 'post';
+        expect(submit.endpoint.method).toBe('PUT');
+        submit.endpoint.method = 'POST';
         trigger(button.node(), 'click');
         await nextTick();
         expect(messages.length).toBe(1);
@@ -90,4 +90,38 @@ describe('form submit -', () => {
         trigger(button.node(), 'click');
         expect(logger.pop(1)[0]).toBe('[d3-form-submit] No url, cannot submit form');
     });
+
+    test ('error', async () => {
+        var messages = [],
+            vm = view({
+                model: {
+                    $formMessage (data) {
+                        messages.push(data);
+                    }
+                }
+            }).use(viewForms);
+
+        await vm.mount(vm.viewElement(`<div><d3form schema='${jsonform3}'></d3form></div>`));
+        var form = vm.sel.select('form').model(),
+            button = vm.sel.select('button');
+
+        form.inputs.foo.value = 'vhcgdsv';
+        form.inputs.token.value = 'hsjdgvchgjdc';
+        await nextTick();
+        expect(form.$isValid()).toBe(true);
+        trigger(button.node(), 'click');
+        await nextTick();
+        expect(messages.length).toBe(1);
+        expect(messages[0].level).toBe('error');
+        expect(messages[0].response.status).toBe(405);
+        //
+        // test the redirect
+        var submit = button.model();
+        submit.endpoint.url = '/error';
+        trigger(button.node(), 'click');
+        await nextTick();
+        expect(messages.length).toBe(2);
+        expect(messages[1].level).toBe('error');
+        expect(messages[1].response).toBe(undefined);
+    });
 });