Merge 5d68d84 into 933acdd

__tests__/messages.spec.js

@@ -63,6 +63,55 @@ describe('messages', () => {
     );
   });
 
+  it('messages with parameters', done => {
+    const messages = {
+      required: 'Field %s required!',
+    };
+    const schema = new Schema({
+      v: {
+        required: true,
+      },
+    });
+    schema.messages(messages);
+    schema.validate(
+      {
+        v: '',
+      },
+      errors => {
+        expect(errors).toBeTruthy();
+        expect(errors.length).toBe(1);
+        expect(errors[0].message).toBe('Field v required!');
+        expect(Object.keys(messages).length).toBe(1);
+        done();
+      },
+    );
+  });
+
+  it('messages can be without parameters', done => {
+    const messages = {
+      required: 'required!',
+    };
+    const schema = new Schema({
+      v: {
+        required: true,
+      },
+    });
+    schema.messages(messages);
+    schema.validate(
+      {
+        v: '',
+      },
+      errors => {
+        expect(errors).toBeTruthy();
+        expect(errors.length).toBe(1);
+        expect(errors[0].message).toBe('required!');
+        expect(Object.keys(messages).length).toBe(1);
+        expect(messages.required).toBe('required!');
+        done();
+      },
+    );
+  });
+
   it('message can be object', done => {
     const atom = {};
     const messages = {

src/util.js

@@ -64,9 +64,6 @@ export function format(...args) {
           return x;
       }
     });
-    for (let arg = args[i]; i < len; arg = args[++i]) {
-      str += ` ${arg}`;
-    }
     return str;
   }
   return f;