diff --git a/.eslintrc b/.eslintrc index 790e965..20e5556 100644 --- a/.eslintrc +++ b/.eslintrc @@ -13,7 +13,6 @@ "max-statements": [2, 19], "new-cap": [2, { "capIsNewExceptions": ["Template"] }], "no-extra-parens": [0], - "object-curly-spacing": [0, "always"], "operator-linebreak": [2, "after"] } } diff --git a/example/complex.js b/example/complex.js index f19971e..49b2dfa 100644 --- a/example/complex.js +++ b/example/complex.js @@ -27,9 +27,9 @@ var complexForm = forms.create({ name: fields.string({ required: validators.required('%s is required, silly!') }), - email: fields.email({required: true, label: 'Email Address'}), + email: fields.email({ required: true, label: 'Email Address' }), website: fields.url(), - password: fields.password({required: true}), + password: fields.password({ required: true }), password_confirm: fields.password({ required: true, validators: [validators.matchField('password')] @@ -58,19 +58,19 @@ var complexForm = forms.create({ ] }), more_options: fields.array({ - choices: {one: 'item 1', two: 'item 2', three: 'item 3'}, + choices: { one: 'item 1', two: 'item 2', three: 'item 3' }, widget: widgets.multipleCheckbox() }), even_more: fields.string({ - choices: {one: 'item 1', two: 'item 2', three: 'item 3'}, + choices: { one: 'item 1', two: 'item 2', three: 'item 3' }, widget: widgets.multipleRadio() }), and_more: fields.array({ - choices: {one: 'item 1', two: 'item 2', three: 'item 3'}, + choices: { one: 'item 1', two: 'item 2', three: 'item 3' }, widget: widgets.multipleSelect() }), notes: fields.string({ - widget: widgets.textarea({rows: 6}) + widget: widgets.textarea({ rows: 6 }) }), spam_me: fields['boolean'](), nested_1: { @@ -84,13 +84,13 @@ http.createServer(function (req, res) { complexForm.handle(req, { success: function (form) { var req_data = parse(req.url, 1).query; - res.writeHead(200, {'Content-Type': 'text/html'}); + res.writeHead(200, { 'Content-Type': 'text/html' }); res.write('

Success!

'); res.write('

' + util.inspect(req_data) + '

'); res.end('
' + util.inspect(form.data) + '
'); }, other: function (form) { - res.writeHead(200, {'Content-Type': 'text/html'}); + res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(template.expand({ form: form.toHTML(), method: 'POST', diff --git a/example/simple.js b/example/simple.js index 806b846..a847978 100644 --- a/example/simple.js +++ b/example/simple.js @@ -16,21 +16,21 @@ var template = jsontemplate.Template( // our example registration form var reg_form = forms.create({ - username: fields.string({required: true}), - password: fields.password({required: true}), + username: fields.string({ required: true }), + password: fields.password({ required: true }), confirm: fields.password({ required: true, validators: [validators.matchField('password')] }), personal: { - name: fields.string({required: true, label: 'Name'}), - email: fields.email({required: true, label: 'Email'}), + name: fields.string({ required: true, label: 'Name' }), + email: fields.email({ required: true, label: 'Email' }), address: { - address1: fields.string({required: true, label: 'Address 1'}), - address2: fields.string({label: 'Address 2'}), - city: fields.string({required: true, label: 'City'}), - state: fields.string({required: true, label: 'State'}), - zip: fields.number({required: true, label: 'ZIP'}) + address1: fields.string({ required: true, label: 'Address 1' }), + address2: fields.string({ label: 'Address 2' }), + city: fields.string({ required: true, label: 'City' }), + state: fields.string({ required: true, label: 'State' }), + zip: fields.number({ required: true, label: 'ZIP' }) } } }); @@ -38,13 +38,13 @@ var reg_form = forms.create({ http.createServer(function (req, res) { reg_form.handle(req, { success: function (form) { - res.writeHead(200, {'Content-Type': 'text/html'}); + res.writeHead(200, { 'Content-Type': 'text/html' }); res.write('

Success!

'); res.end('
' + util.inspect(form.data) + '
'); }, // perhaps also have error and empty events other: function (form) { - res.writeHead(200, {'Content-Type': 'text/html'}); + res.writeHead(200, { 'Content-Type': 'text/html' }); res.end(template.expand({ form: form.toHTML(), enctype: '', diff --git a/lib/widgets.js b/lib/widgets.js index 15f4632..a22d7b0 100644 --- a/lib/widgets.js +++ b/lib/widgets.js @@ -171,7 +171,7 @@ exports.multipleCheckbox = function (options) { var inputHTML = tag('input', [attrs, userAttrs, w.attrs || {}]); // label element - var labelHTML = tag('label', {'for': id, classes: w.labelClasses}, f.choices[k]); + var labelHTML = tag('label', { 'for': id, classes: w.labelClasses }, f.choices[k]); return html + inputHTML + labelHTML; }, ''); @@ -219,7 +219,7 @@ exports.multipleRadio = function (options) { }; var inputHTML = tag('input', [attrs, userAttrs, w.attrs || {}]); // label element - var labelHTML = tag('label', {'for': id, classes: w.labelClasses}, f.choices[k]); + var labelHTML = tag('label', { 'for': id, classes: w.labelClasses }, f.choices[k]); return html + inputHTML + labelHTML; }, ''); diff --git a/test/test-fields.js b/test/test-fields.js index 340bc40..a9d0575 100644 --- a/test/test-fields.js +++ b/test/test-fields.js @@ -130,7 +130,7 @@ var testField = function (field) { test(field + ' validate required', function (t) { t.plan(5); - var f = fields[field]({required: true}); + var f = fields[field]({ required: true }); f.validators = []; f.bind(undefined).validate('form', function (err, fieldObject) { t.equal(fieldObject.value, undefined); @@ -290,7 +290,7 @@ test('email validators', function (t) { fields.email().validators[0].toString(), forms.validators.email().toString() ); - var f = fields.email({validators: [fn1, fn2]}); + var f = fields.email({ validators: [fn1, fn2] }); t.equal( f.validators[0].toString(), forms.validators.email().toString() @@ -350,7 +350,7 @@ test('url validators', function (t) { fields.url().validators[0].toString(), forms.validators.url().toString() ); - var f = fields.url({validators: [fn1, fn2]}); + var f = fields.url({ validators: [fn1, fn2] }); t.equal( f.validators[0].toString(), forms.validators.url().toString() @@ -382,7 +382,7 @@ test('date validators', function (t) { fields.date().validators[0].toString(), forms.validators.date().toString() ); - var f = fields.date({validators: [fn1, fn2]}); + var f = fields.date({ validators: [fn1, fn2] }); t.equal( f.validators[0].toString(), forms.validators.date().toString() diff --git a/test/test-form.js b/test/test-form.js index 65b1703..3877cf7 100644 --- a/test/test-form.js +++ b/test/test-form.js @@ -20,7 +20,7 @@ test('bind', function (t) { t.equal(form.isValid, undefined); // bound - var f = form.bind({field1: 'data one', field2: 'data two'}); + var f = form.bind({ field1: 'data one', field2: 'data two' }); t.equal(f.fields.field1.value, 'data one'); t.equal(f.fields.field1.data, 'data one'); t.equal(f.fields.field1.error, undefined); @@ -32,7 +32,7 @@ test('bind', function (t) { t.equal(f.bind, undefined); t.equal(f.handle, undefined); - t.deepEqual(f.data, {field1: 'data one', field2: 'data two'}); + t.deepEqual(f.data, { field1: 'data one', field2: 'data two' }); t.notEqual(form, f, 'bind returns new form object'); t.end(); @@ -48,7 +48,7 @@ test('bind with missing field in data keeps field in form', function (t) { t.equal(form.isValid, undefined); // bound - var f = form.bind({field1: 'data one'}); + var f = form.bind({ field1: 'data one' }); t.equal(f.fields.field1.value, 'data one'); t.equal(f.fields.field1.data, 'data one'); t.equal(f.fields.field1.error, undefined); @@ -60,7 +60,7 @@ test('bind with missing field in data keeps field in form', function (t) { t.equal(f.bind, undefined); t.equal(f.handle, undefined); - t.deepEqual(f.data, {field1: 'data one', field2: ''}); + t.deepEqual(f.data, { field1: 'data one', field2: '' }); t.notEqual(form, f, 'bind returns new form object'); t.end(); @@ -78,7 +78,7 @@ test('validate', function (t) { }] }) }); - var data = {field1: 'data one', field2: 'data two'}; + var data = { field1: 'data one', field2: 'data two' }; form.bind(data).validate(function (err, f) { t.equal(f.fields.field1.value, 'data one'); t.equal(f.fields.field1.data, 'data one'); @@ -87,7 +87,7 @@ test('validate', function (t) { t.equal(f.fields.field2.data, 'data two'); t.equal(f.fields.field2.error, 'validation error'); - t.deepEqual(f.data, {field1: 'data one', field2: 'data two'}); + t.deepEqual(f.data, { field1: 'data one', field2: 'data two' }); t.notEqual(form, f, 'bind returns new form object'); t.notOk(f.isValid()); @@ -158,7 +158,7 @@ test('validate invalid data', function (t) { test('handle empty', function (t) { t.plan(3); - var f = forms.create({field1: forms.fields.string()}); + var f = forms.create({ field1: forms.fields.string() }); f.bind = function () { t.fail('bind should not be called'); }; @@ -187,7 +187,7 @@ test('handle empty', function (t) { test('handle success', function (t) { t.plan(8); - var f = forms.create({field1: forms.fields.string()}); + var f = forms.create({ field1: forms.fields.string() }); var callOrder = []; f.bind = function () { callOrder.push('bind'); @@ -199,7 +199,7 @@ test('handle success', function (t) { t.ok(true, 'validate called'); callback(null, f); }; - f.handle({field1: 'test'}, { + f.handle({ field1: 'test' }, { empty: function () { t.fail('empty should not be called'); }, @@ -214,7 +214,7 @@ test('handle success', function (t) { t.fail('other should not be called'); } }); - f.handle({field1: 'test'}, { + f.handle({ field1: 'test' }, { other: function () { t.ok(true, 'other called'); t.equal(callOrder.length, 2); @@ -225,7 +225,7 @@ test('handle success', function (t) { test('handle empty object', function (t) { t.plan(3); - var f = forms.create({field1: forms.fields.string()}); + var f = forms.create({ field1: forms.fields.string() }); f.bind = function () { t.ok(true, 'bind called'); f.fields.field1.error = 'some error'; @@ -261,7 +261,7 @@ test('handle empty object', function (t) { test('handle sends callbacks', function (t) { t.plan(9); - var f = forms.create({field1: forms.fields.string()}); + var f = forms.create({ field1: forms.fields.string() }); f.bind = function () { f.isValid = function () { return true; }; @@ -276,7 +276,7 @@ test('handle sends callbacks', function (t) { t.equal(typeof callbacks.empty, 'function'); } }); - f.handle({field1: 'test'}, { + f.handle({ field1: 'test' }, { success: function testing(form, callbacks) { t.equal(Object.keys(callbacks).length, 1); t.equal(typeof callbacks.success, 'function'); @@ -287,7 +287,7 @@ test('handle sends callbacks', function (t) { f.isValid = function () { return false; }; return f; }; - f.handle({field1: 'test'}, { + f.handle({ field1: 'test' }, { success: function yay() {}, error: function nay(form, callbacks) { t.equal(Object.keys(callbacks).length, 2); @@ -296,7 +296,7 @@ test('handle sends callbacks', function (t) { } }); - f.handle({field1: 'test'}, { + f.handle({ field1: 'test' }, { other: function testing(form, callbacks) { t.equal(Object.keys(callbacks).length, 1); t.equal(typeof callbacks.other, 'function'); @@ -312,13 +312,13 @@ test('handle missing multi-form section', function (t) { section1: { field1: forms.fields.string() }, section2: { field1: forms.fields.string() } }); - f.bind({section1: { field1: 'string' }}); + f.bind({ section1: { field1: 'string' } }); t.ok(true, 'Form handled missing section ok.'); }); test('handle error', function (t) { t.plan(5); - var f = forms.create({field1: forms.fields.string()}); + var f = forms.create({ field1: forms.fields.string() }); f.bind = function () { t.ok(true, 'bind called'); f.fields.field1.error = 'some error'; @@ -329,7 +329,7 @@ test('handle error', function (t) { t.ok(true, 'validate called'); callback(null, f); }; - f.handle({foo: 'bar'}, { + f.handle({ foo: 'bar' }, { empty: function () { t.fail('empty should not be called'); }, @@ -354,7 +354,7 @@ test('handle error', function (t) { test('handle ServerRequest GET', function (t) { t.plan(1); - var f = forms.create({field1: forms.fields.string()}), + var f = forms.create({ field1: forms.fields.string() }), req = new http.IncomingMessage(); req.method = 'GET'; req.url = '/?field1=test'; @@ -368,9 +368,9 @@ test('handle ServerRequest GET', function (t) { test('handle ServerRequest POST', function (t) { t.plan(1); - var f = forms.create({field1: forms.fields.string()}), + var f = forms.create({ field1: forms.fields.string() }), req = new http.IncomingMessage(); - req.body = {field1: 'test'}; + req.body = { field1: 'test' }; req.method = 'POST'; f.handle(req, { success: function (form) { @@ -422,9 +422,9 @@ test('validates past first error with validatePastFirstError option', function ( test('handle ServerRequest POST with bodyDecoder', function (t) { t.plan(1); - var f = forms.create({field1: forms.fields.string()}), + var f = forms.create({ field1: forms.fields.string() }), req = new http.IncomingMessage(); - req.body = {field1: 'test'}; + req.body = { field1: 'test' }; req.method = 'POST'; f.handle(req, { success: function (form) { @@ -435,7 +435,7 @@ test('handle ServerRequest POST with bodyDecoder', function (t) { }); test('div', function (t) { - var f = forms.create({fieldname: forms.fields.string()}); + var f = forms.create({ fieldname: forms.fields.string() }); t.equal( f.toHTML(), '
' + @@ -448,7 +448,7 @@ test('div', function (t) { test('div required', function (t) { var f = forms.create({ - fieldname: forms.fields.string({required: true}) + fieldname: forms.fields.string({ required: true }) }); t.equal( f.toHTML(), @@ -462,8 +462,8 @@ test('div required', function (t) { test('div bound', function (t) { t.plan(1); - var form = forms.create({name: forms.fields.string()}); - form.bind({name: 'val'}).validate(function (err, f) { + var form = forms.create({ name: forms.fields.string() }); + form.bind({ name: 'val' }).validate(function (err, f) { t.equal( f.toHTML(), '
' + diff --git a/test/test-render.js b/test/test-render.js index 866bbfc..05fbc8e 100644 --- a/test/test-render.js +++ b/test/test-render.js @@ -5,7 +5,7 @@ var test = require('tape'); var testWrap = function (tag) { test(tag, function (t) { - var f = forms.create({fieldname: forms.fields.string()}); + var f = forms.create({ fieldname: forms.fields.string() }); t.equal( f.toHTML(forms.render[tag]), '<' + tag + ' class="field">' + @@ -18,7 +18,7 @@ var testWrap = function (tag) { test(tag + ' required', function (t) { var f = forms.create({ - fieldname: forms.fields.string({required: true}) + fieldname: forms.fields.string({ required: true }) }); t.equal( f.toHTML(forms.render[tag]), @@ -33,7 +33,7 @@ var testWrap = function (tag) { test(tag + ' bound', function (t) { t.plan(1); var form = forms.create({ name: forms.fields.string() }); - form.bind({name: 'val'}).validate(function (err, f) { + form.bind({ name: 'val' }).validate(function (err, f) { t.equal( f.toHTML(forms.render[tag]), '<' + tag + ' class="field">' + @@ -92,7 +92,7 @@ var testWrap = function (tag) { }] }) }); - f2.bind({field_name: 'val', field_name_error_after: 'foo'}).validate(function (err, f) { + f2.bind({ field_name: 'val', field_name_error_after: 'foo' }).validate(function (err, f) { t.equal( f.toHTML(forms.render[tag]), '<' + tag + ' class="field error">' + @@ -120,7 +120,7 @@ var testWrap = function (tag) { test(tag + ' multipleCheckbox', function (t) { var f = forms.create({ fieldname: forms.fields.string({ - choices: {one: 'item one'}, + choices: { one: 'item one' }, widget: forms.widgets.multipleCheckbox(), legendClasses: ['test1', 'test2'], fieldsetClasses: ['test3', 'test4'] @@ -142,7 +142,7 @@ var testWrap = function (tag) { test(tag + ' multipleRadio', function (t) { var f = forms.create({ fieldname: forms.fields.string({ - choices: {one: 'item one'}, + choices: { one: 'item one' }, widget: forms.widgets.multipleRadio(), legendClasses: ['test1', 'test2'], fieldsetClasses: ['test3', 'test4'] @@ -214,7 +214,7 @@ testWrap('p'); testWrap('li'); test('table', function (t) { - var f = forms.create({fieldname: forms.fields.string()}); + var f = forms.create({ fieldname: forms.fields.string() }); t.equal( f.toHTML(forms.render.table), '' + @@ -229,7 +229,7 @@ test('table', function (t) { test('table required', function (t) { var f = forms.create({ - fieldname: forms.fields.string({required: true}) + fieldname: forms.fields.string({ required: true }) }); t.equal( f.toHTML(forms.render.table), @@ -246,7 +246,7 @@ test('table required', function (t) { test('table bound', function (t) { t.plan(1); var form = forms.create({ name: forms.fields.string() }); - form.bind({name: 'val'}).validate(function (err, f) { + form.bind({ name: 'val' }).validate(function (err, f) { t.equal( f.toHTML(forms.render.table), '' + @@ -311,7 +311,7 @@ test('table bound error', function (t) { }] }) }); - f2.bind({field_name: 'val', field_name_error_after: 'foo'}).validate(function (err, f) { + f2.bind({ field_name: 'val', field_name_error_after: 'foo' }).validate(function (err, f) { t.equal( f.toHTML(forms.render.table), '' + diff --git a/test/test-validators.js b/test/test-validators.js index ac6affb..f646132 100644 --- a/test/test-validators.js +++ b/test/test-validators.js @@ -7,8 +7,8 @@ test('matchField', function (t) { var v = validators.matchField('field1', 'f2 dnm %s'), data = { fields: { - field1: {data: 'one'}, - field2: {data: 'two'} + field1: { data: 'one' }, + field2: { data: 'two' } } }; t.plan(2); @@ -84,20 +84,20 @@ test('requiresFieldIfEmpty', function (t) { t.plan(4); var v = validators.requiresFieldIfEmpty('alternate_field', 'field 1: %s field2: %s'), empty_fields = { - field: {name: 'field', data: ' '}, - alternate_field: {name: 'alternate_field', data: ''} + field: { name: 'field', data: ' ' }, + alternate_field: { name: 'alternate_field', data: '' } }, filled_fields = { - field: {name: 'field', data: 'filled'}, - alternate_field: {name: 'alternate_field', data: 'also filled'} + field: { name: 'field', data: 'filled' }, + alternate_field: { name: 'alternate_field', data: 'also filled' } }, first_filled = { - field: {name: 'field', data: 'filled'}, - alternate_field: {name: 'alternate_field', data: ''} + field: { name: 'field', data: 'filled' }, + alternate_field: { name: 'alternate_field', data: '' } }, second_filled = { - field: {name: 'field', data: ''}, - alternate_field: {name: 'alternate_field', data: 'filled'} + field: { name: 'field', data: '' }, + alternate_field: { name: 'alternate_field', data: 'filled' } }; v({ fields: empty_fields }, empty_fields.field, function (emptyError) { t.equal(emptyError, 'field 1: field field2: alternate_field'); @@ -116,9 +116,9 @@ test('requiresFieldIfEmpty', function (t) { test('min', function (t) { t.plan(2); - validators.min(100, 'Value must be greater than or equal to %s.')('form', {data: 50}, function (tooSmallError) { + validators.min(100, 'Value must be greater than or equal to %s.')('form', { data: 50 }, function (tooSmallError) { t.equal(tooSmallError, 'Value must be greater than or equal to 100.'); - validators.min(100)('form', {data: 100}, function (err) { + validators.min(100)('form', { data: 100 }, function (err) { t.equal(err, undefined); t.end(); }); @@ -127,9 +127,9 @@ test('min', function (t) { test('max', function (t) { t.plan(2); - validators.max(100, 'Value must be less than or equal to %s.')('form', {data: 150}, function (tooBigError) { + validators.max(100, 'Value must be less than or equal to %s.')('form', { data: 150 }, function (tooBigError) { t.equal(tooBigError, 'Value must be less than or equal to 100.'); - validators.max(100)('form', {data: 100}, function (err) { + validators.max(100)('form', { data: 100 }, function (err) { t.equal(err, undefined); t.end(); }); @@ -138,9 +138,9 @@ test('max', function (t) { test('range', function (t) { t.plan(2); - validators.range(10, 20, 'Value must be between %s and %s.')('form', {data: 50}, function (rangeError) { + validators.range(10, 20, 'Value must be between %s and %s.')('form', { data: 50 }, function (rangeError) { t.equal(rangeError, 'Value must be between 10 and 20.'); - validators.range(10, 20)('form', {data: 15}, function (err) { + validators.range(10, 20)('form', { data: 15 }, function (err) { t.equal(err, undefined); t.end(); }); @@ -149,12 +149,12 @@ test('range', function (t) { test('regexp', function (t) { t.plan(3); - validators.regexp(/^\d+$/)('form', {data: 'abc123'}, function (invalidError) { + validators.regexp(/^\d+$/)('form', { data: 'abc123' }, function (invalidError) { t.equal(invalidError, 'Invalid format.'); - validators.regexp(/^\d+$/)('form', {data: '123'}, function (noError) { + validators.regexp(/^\d+$/)('form', { data: '123' }, function (noError) { t.equal(noError, undefined); var v = validators.regexp('^\\d+$', 'my message'); - v('form', {data: 'abc123'}, function (err) { + v('form', { data: 'abc123' }, function (err) { t.equal(err, 'my message'); t.end(); }); @@ -164,12 +164,12 @@ test('regexp', function (t) { test('email', function (t) { t.plan(3); - validators.email('Email was invalid.')('form', {data: 'asdf'}, function (invalidEmailError) { + validators.email('Email was invalid.')('form', { data: 'asdf' }, function (invalidEmailError) { t.equal(invalidEmailError, 'Email was invalid.'); var v = validators.email(); - v('form', {data: 'asdf@asdf.com'}, function (noError) { + v('form', { data: 'asdf@asdf.com' }, function (noError) { t.equal(noError, undefined); - v('form', {data: 'a←+b@f.museum'}, function (err) { + v('form', { data: 'a←+b@f.museum' }, function (err) { t.equal(err, undefined); t.end(); }); @@ -179,15 +179,15 @@ test('email', function (t) { test('url', function (t) { t.plan(4); - validators.url(false, 'URL was invalid.')('form', {data: 'asdf.com'}, function (invalidURLError) { + validators.url(false, 'URL was invalid.')('form', { data: 'asdf.com' }, function (invalidURLError) { t.equal(invalidURLError, 'URL was invalid.'); - validators.url()('form', {data: 'http://asdf.com'}, function (err) { + validators.url()('form', { data: 'http://asdf.com' }, function (err) { t.equal(err, undefined); }); }); - validators.url(true)('form', {data: 'localhost/test.html'}, function (invalidURLError) { + validators.url(true)('form', { data: 'localhost/test.html' }, function (invalidURLError) { t.equal(invalidURLError, 'Please enter a valid URL.'); - validators.url(true)('form', {data: 'http://localhost/test.html'}, function (err) { + validators.url(true)('form', { data: 'http://localhost/test.html' }, function (err) { t.equal(err, undefined); }); }); @@ -196,15 +196,15 @@ test('url', function (t) { test('date', function (t) { t.plan(4); - validators.date('Date input must contain a valid date.')('form', {data: '02/28/2012'}, function (invalidDateError) { + validators.date('Date input must contain a valid date.')('form', { data: '02/28/2012' }, function (invalidDateError) { t.equal(invalidDateError, 'Date input must contain a valid date.'); - validators.date()('form', {data: '2012-02-28'}, function (err) { + validators.date()('form', { data: '2012-02-28' }, function (err) { t.equal(err, undefined); }); }); - validators.date()('form', {data: '2012.02.30'}, function (invalidDateError) { + validators.date()('form', { data: '2012.02.30' }, function (invalidDateError) { t.equal(invalidDateError, 'Inputs of type "date" must be valid dates in the format "yyyy-mm-dd"'); - validators.date()('form', {data: '2012-02-30'}, function (err) { + validators.date()('form', { data: '2012-02-30' }, function (err) { t.equal(err, undefined); }); }); @@ -213,9 +213,9 @@ test('date', function (t) { test('minlength', function (t) { t.plan(2); - validators.minlength(5, 'Enter at least %s characters.')('form', {data: '1234'}, function (tooShortError) { + validators.minlength(5, 'Enter at least %s characters.')('form', { data: '1234' }, function (tooShortError) { t.equal(tooShortError, 'Enter at least 5 characters.'); - validators.minlength(5)('form', {data: '12345'}, function (err) { + validators.minlength(5)('form', { data: '12345' }, function (err) { t.equal(err, undefined); t.end(); }); @@ -224,9 +224,9 @@ test('minlength', function (t) { test('maxlength', function (t) { t.plan(2); - validators.maxlength(5)('form', {data: '123456'}, function (tooLongError) { + validators.maxlength(5)('form', { data: '123456' }, function (tooLongError) { t.equal(tooLongError, 'Please enter no more than 5 characters.'); - validators.maxlength(5)('form', {data: '12345'}, function (err) { + validators.maxlength(5)('form', { data: '12345' }, function (err) { t.equal(err, undefined); t.end(); }); @@ -235,16 +235,16 @@ test('maxlength', function (t) { test('rangelength', function (t) { t.plan(4); - validators.rangelength(2, 4, 'Enter between %s and %s characters.')('form', {data: '12345'}, function (err) { + validators.rangelength(2, 4, 'Enter between %s and %s characters.')('form', { data: '12345' }, function (err) { t.equal(err, 'Enter between 2 and 4 characters.'); }); - validators.rangelength(2, 4)('form', {data: '1'}, function (err) { + validators.rangelength(2, 4)('form', { data: '1' }, function (err) { t.equal(err, 'Please enter a value between 2 and 4 characters long.'); }); - validators.rangelength(2, 4)('form', {data: '12'}, function (err) { + validators.rangelength(2, 4)('form', { data: '12' }, function (err) { t.equal(err, undefined); }); - validators.rangelength(2, 4)('form', {data: '1234'}, function (err) { + validators.rangelength(2, 4)('form', { data: '1234' }, function (err) { t.equal(err, undefined); }); t.end(); @@ -323,8 +323,8 @@ test('nonFormatMessage1', function (t) { var v = validators.matchField('field1', 'f2 dnm f1'), data = { fields: { - field1: {data: 'one'}, - field2: {data: 'two'} + field1: { data: 'one' }, + field2: { data: 'two' } } }; v(data, data.fields.field2, function (err) { @@ -340,9 +340,9 @@ test('nonFormatMessage1', function (t) { test('nonFormatMessage2', function (t) { t.plan(2); var v = validators.min(100, '1234567890'); - v('form', {data: 50}, function (tooSmallError) { + v('form', { data: 50 }, function (tooSmallError) { t.equals(tooSmallError, '1234567890'); - validators.min(100)('form', {data: 100}, function (err) { + validators.min(100)('form', { data: 100 }, function (err) { t.equals(err, undefined); t.end(); }); @@ -352,9 +352,9 @@ test('nonFormatMessage2', function (t) { test('nonFormatMessage3', function (t) { t.plan(2); var v = validators.minlength(5, 'qwertyuiop'); - v('form', {data: '1234'}, function (tooShortError) { + v('form', { data: '1234' }, function (tooShortError) { t.equals(tooShortError, 'qwertyuiop'); - validators.minlength(5)('form', {data: '12345'}, function (err) { + validators.minlength(5)('form', { data: '12345' }, function (err) { t.equals(err, undefined); t.end(); }); diff --git a/test/test-widgets.js b/test/test-widgets.js index 224a8bc..b9fc323 100644 --- a/test/test-widgets.js +++ b/test/test-widgets.js @@ -9,9 +9,9 @@ var test_input = function (type) { forms.widgets[type]().toHTML('field1'), '' ); - var w = forms.widgets[type]({classes: ['test1', 'test2', 'test3']}); + var w = forms.widgets[type]({ classes: ['test1', 'test2', 'test3'] }); t.equal( - w.toHTML('field2', {id: 'form2_field2'}), + w.toHTML('field2', { id: 'form2_field2' }), '' ); @@ -19,7 +19,7 @@ var test_input = function (type) { if (type === 'password') { expectedHTML = ''; } - t.equal(forms.widgets[type]().toHTML('field1', {value: 'some value'}), expectedHTML); + t.equal(forms.widgets[type]().toHTML('field1', { value: 'some value' }), expectedHTML); t.equal(forms.widgets[type]().type, type); var expectedValues = { password: null }; @@ -53,7 +53,7 @@ test('date', function (t) { ); t.equal( - w.toHTML('field1', {value: '2013-03-03'}), + w.toHTML('field1', { value: '2013-03-03' }), '' ); @@ -65,17 +65,17 @@ test('checkbox', function (t) { forms.widgets.checkbox().toHTML('field1'), '' ); - var w = forms.widgets.checkbox({classes: ['test1', 'test2', 'test3']}); + var w = forms.widgets.checkbox({ classes: ['test1', 'test2', 'test3'] }); t.equal( - w.toHTML('field2', {id: 'form2_field2'}), + w.toHTML('field2', { id: 'form2_field2' }), '' ); t.equal( - forms.widgets.checkbox().toHTML('field', {value: true}), + forms.widgets.checkbox().toHTML('field', { value: true }), '' ); t.equal( - forms.widgets.checkbox().toHTML('field', {value: false}), + forms.widgets.checkbox().toHTML('field', { value: false }), '' ); t.equal(forms.widgets.checkbox().type, 'checkbox'); @@ -95,7 +95,7 @@ test('select', function (t) { '' + '' ); - var widget = forms.widgets.select({classes: ['one', 'two']}); + var widget = forms.widgets.select({ classes: ['one', 'two'] }); t.equal( widget.toHTML('name', { choices: { @@ -142,7 +142,7 @@ test('textarea', function (t) { rows: 20, cols: 80, placeholder: 'hi!' - }).toHTML('name', {id: 'someid', value: 'value'}), + }).toHTML('name', { id: 'someid', value: 'value' }), '' ); t.equal(forms.widgets.textarea().type, 'textarea'); @@ -153,7 +153,7 @@ test('multipleCheckbox', function (t) { var w = forms.widgets.multipleCheckbox(); t.test('basic functionality', function (st) { var field = { - choices: {one: 'Item one', two: 'Item two', three: 'Item three'}, + choices: { one: 'Item one', two: 'Item two', three: 'Item three' }, value: 'two' }; st.equal( @@ -226,7 +226,7 @@ test('multipleCheckbox', function (t) { test('multipleCheckbox multiple selected', function (t) { var w = forms.widgets.multipleCheckbox(), field = { - choices: {one: 'Item one', two: 'Item two', three: 'Item three'}, + choices: { one: 'Item one', two: 'Item two', three: 'Item three' }, value: ['two', 'three'] }; t.equal( @@ -245,7 +245,7 @@ test('multipleCheckbox multiple selected', function (t) { test('multipleRadio', function (t) { var w = forms.widgets.multipleRadio(); var field = { - choices: {one: 'Item one', two: 'Item two', three: 'Item three'}, + choices: { one: 'Item one', two: 'Item two', three: 'Item three' }, value: 'two' }; t.equal( @@ -296,7 +296,7 @@ test('multipleRadio', function (t) { }); t.test('label classes', function (st) { - var widget = forms.widgets.multipleRadio({labelClasses: ['test1', 'test2', 'test3']}); + var widget = forms.widgets.multipleRadio({ labelClasses: ['test1', 'test2', 'test3'] }); st.equal( widget.toHTML('name', field), '' + @@ -315,7 +315,7 @@ test('multipleRadio', function (t) { test('multipleRadio multiple selected', function (t) { var w = forms.widgets.multipleRadio(); var field = { - choices: {one: 'Item one', two: 'Item two', three: 'Item three'}, + choices: { one: 'Item one', two: 'Item two', three: 'Item three' }, value: ['two', 'three'] }; t.equal( @@ -333,17 +333,19 @@ test('multipleRadio multiple selected', function (t) { test('multipleSelect', function (t) { t.equal( - forms.widgets.multipleSelect().toHTML('name', {choices: { - val1: 'text1', - val2: 'text2' - }}), + forms.widgets.multipleSelect().toHTML('name', { + choices: { + val1: 'text1', + val2: 'text2' + } + }), '' ); t.equal( - forms.widgets.multipleSelect({classes: ['one', 'two']}).toHTML('name', { + forms.widgets.multipleSelect({ classes: ['one', 'two'] }).toHTML('name', { choices: { val1: 'text1', val2: 'text2', @@ -361,7 +363,7 @@ test('multipleSelect', function (t) { t.equal(forms.widgets.multipleSelect().type, 'multipleSelect'); t.test('stringifies values', function (st) { - var widget = forms.widgets.multipleSelect({classes: ['one', 'two']}); + var widget = forms.widgets.multipleSelect({ classes: ['one', 'two'] }); st.test('single bound values', function (t2) { var html = widget.toHTML('name', { @@ -553,7 +555,7 @@ test('custom attributes', function (t) { 'data-test': 'foo' }); var field = { - choices: {one: 'Item one', two: 'Item two', three: 'Item three'}, + choices: { one: 'Item one', two: 'Item two', three: 'Item three' }, value: 'two' }; t.equal( @@ -570,7 +572,7 @@ test('custom attributes', function (t) { 'data-test': 'foo' }); var field2 = { - choices: {one: 'Item one', two: 'Item two', three: 'Item three'}, + choices: { one: 'Item one', two: 'Item two', three: 'Item three' }, value: 'two' }; t.equal( @@ -610,8 +612,8 @@ test('dynamic widget attributes', function (t) { var re = /autocomplete="no"/; keys.forEach(function (name) { var w = forms.widgets[name](); - w.attrs = {autocomplete: 'no'}; - var html = w.toHTML('test', {choices: {foo: 'bar'}}); + w.attrs = { autocomplete: 'no' }; + var html = w.toHTML('test', { choices: { foo: 'bar' } }); t.equal(re.test(html), true); }); t.end();