views/layouts/default.ctp @@ -64,6 +64,10 @@ //do some validation here and return either true or false. } -Tips - * I wrote an article for PHPArch about JavaScript validation(http://c7y.phparch.com/c/entry/1/art,improved_javascript_validation), which raised some concerns that this approach may reveal too much about an application's security. If this is a concern for you, but you still want to use this helper, there is an option to whitelist rules can be applied on the client side. To use to this feature set the list in your bootstrap.php: - Configure::write('javascriptValidationWhitelist', array('alphaNumeric', 'minLength')); \ No newline at end of file +/* Tests */ + 1. CakePHP unit tests are available through the normal /test.php + 2. JavaScript unit test can be run by visiting /js_validate/test. + +/* Tips */ + * I wrote an article for PHPArch about JavaScript validation(http://c7y.phparch.com/c/entry/1/art,improved_javascript_validation), which raised some concerns that this approach may reveal too much about an application's security. If this is a concern for you, but you still want to use this helper, there is an option to whitelist rules can be applied on the client side. To use to this feature set the list in your bootstrap.php: + Configure::write('javascriptValidationWhitelist', array('alphaNumeric', 'minLength')); \ No newline at end of file README @@ -64,6 +64,24 @@ class JsValidate extends JsValidateAppModel { 'numeric' => array( 'rule1' => array('rule' => 'numeric') ), + 'notEmpty' => array( + 'rule1' => array('rule' => 'notEmpty') + ), + 'phone' => array( + 'rule1' => array('rule' => array('phone', null, 'us')) + ), + 'postal' => array( + 'rule1' => array('rule' => array('postal', null, 'us')) + ), + 'range' => array( + 'rule1' => array('rule' => array('range', 0, 10)) + ), + 'ssn' => array( + 'rule1' => array('rule' => array('ssn', null, 'us')) + ), + 'url' => array( + 'rule1' => array('rule' => 'url') + ) ); } ?> \ No newline at end of file models/js_validate.php @@ -161,10 +161,45 @@ class JsValidateTestCase extends CakeTestCase { $this->assertEqual($expected, $validation); } - function atestNotEmpty() { + function testNotEmpty() { $this->JsValidate->validate = array('notEmpty' => $this->JsValidate->backupValidate['notEmpty']); $validation = $this->Validation->bind('JsValidate.JsValidate', array('form' => false)); - $expected = '{"JsValidate.JsValidateNotEmpty":[{"rule":"\/[^\\\\s]+\/m","message":"There was a problem with the field notEmpty"}]}'; + $expected = '{"JsValidate.JsValidateNotEmpty":[{"rule":"\/[^\\\\s]+\/m","message":"There was a problem with the field NotEmpty"}]}'; + $this->assertEqual($expected, $validation); + } + + function testPhone() { + $this->JsValidate->validate = array('phone' => $this->JsValidate->backupValidate['phone']); + $validation = $this->Validation->bind('JsValidate.JsValidate', array('form' => false)); + $expected = '{"JsValidate.JsValidatePhone":[{"rule":"\/^(?:\\\\+?1)?[-. ]?\\\\(?[2-9][0-8][0-9]\\\\)?[-. ]?[2-9][0-9]{2}[-. ]?[0-9]{4}$\/","message":"There was a problem with the field Phone"}]}'; + $this->assertEqual($expected, $validation); + } + + function testPostal() { + $this->JsValidate->validate = array('postal' => $this->JsValidate->backupValidate['postal']); + $validation = $this->Validation->bind('JsValidate.JsValidate', array('form' => false)); + $expected = '{"JsValidate.JsValidatePostal":[{"rule":"\/^[0-9]{5}(?:-[0-9]{4})?$\/i","message":"There was a problem with the field Postal"}]}'; + $this->assertEqual($expected, $validation); + } + + function testRange() { + $this->JsValidate->validate = array('range' => $this->JsValidate->backupValidate['range']); + $validation = $this->Validation->bind('JsValidate.JsValidate', array('form' => false)); + $expected = '{"JsValidate.JsValidateRange":[{"rule":{"rule":"range","params":[0,10]},"message":"There was a problem with the field Range"}]}'; + $this->assertEqual($expected, $validation); + } + + function testSsn() { + $this->JsValidate->validate = array('ssn' => $this->JsValidate->backupValidate['ssn']); + $validation = $this->Validation->bind('JsValidate.JsValidate', array('form' => false)); + $expected = '{"JsValidate.JsValidateSsn":[{"rule":"\/^[0-9]{3}-[0-9]{2}-[0-9]{4}$\/i","message":"There was a problem with the field Ssn"}]}'; + $this->assertEqual($expected, $validation); + } + + function testUrl() { + $this->JsValidate->validate = array('url' => $this->JsValidate->backupValidate['url']); + $validation = $this->Validation->bind('JsValidate.JsValidate', array('form' => false)); + $expected = '{"JsValidate.JsValidateUrl":[{"rule":"\/^(?:(?:https?|ftps?|file|news|gopher):\\\\\/\\\\\/)?(?:(?:(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])\\\\.){3}(?:25[0-5]|2[0-4][0-9]|(?:(?:1[0-9])?|[1-9]?)[0-9])|(?:[a-z0-9][-a-z0-9]*\\\\.)*(?:[a-z0-9][-a-z0-9]{0,62})\\\\.(?:(?:[a-z]{2}\\\\.)?[a-z]{2,4}|museum|travel))(?::[1-9][0-9]{0,3})?(?:\\\\\/?|\\\\\/([\\\\!\"\\\\$&\'\\\\(\\\\)\\\\*\\\\+,-\\\\.@_\\\\:;\\\\=\\\\\/0-9a-z]|(%[0-9a-f]{2}))*)?(?:\\\\?([\\\\!\"\\\\$&\'\\\\(\\\\)\\\\*\\\\+,-\\\\.@_\\\\:;\\\\=\\\\\/0-9a-z]|(%[0-9a-f]{2}))*)?(?:#([\\\\!\"\\\\$&\'\\\\(\\\\)\\\\*\\\\+,-\\\\.@_\\\\:;\\\\=\\\\\/0-9a-z]|(%[0-9a-f]{2}))*)?$\/i","message":"There was a problem with the field Url"}]}'; $this->assertEqual($expected, $validation); } } \ No newline at end of file tests/cases/models/js_validate.test.php @@ -119,5 +119,39 @@ $(function(){ ok( !$.fn.validate.validateRule("49.5", validationRules.JsValidateNumeric[0].rule), "49.5"); ok( !$.fn.validate.validateRule("forty nine", validationRules.JsValidateNumeric[0].rule), "forty nine"); }); -}); - + + test("notEmpty", function() { + ok( $.fn.validate.validateRule("whatever", validationRules.JsValidateNotEmpty[0].rule), "whatever"); + ok( !$.fn.validate.validateRule("", validationRules.JsValidateNotEmpty[0].rule), "<blank>"); + }); + + test("phone", function() { + ok( $.fn.validate.validateRule("555-555-5555", validationRules.JsValidatePhone[0].rule), "555-555-5555"); + ok( !$.fn.validate.validateRule("555-5a5-5555", validationRules.JsValidatePhone[0].rule), "555-5a5-5555"); + }); + + test("postal", function() { + ok( $.fn.validate.validateRule("12345", validationRules.JsValidatePostal[0].rule), "12345"); + ok( $.fn.validate.validateRule("12345-9876", validationRules.JsValidatePostal[0].rule), "12345-9876"); + ok( !$.fn.validate.validateRule("1234a-9876", validationRules.JsValidatePostal[0].rule), "1234a-9876"); + }); + + test("range", function() { + ok( $.fn.validate.validateRule("5", validationRules.JsValidateRange[0].rule), "5"); + ok( $.fn.validate.validateRule("0", validationRules.JsValidateRange[0].rule), "0"); + ok( $.fn.validate.validateRule("10", validationRules.JsValidateRange[0].rule), "10"); + ok( !$.fn.validate.validateRule("-1", validationRules.JsValidateRange[0].rule), "-1"); + ok( !$.fn.validate.validateRule("12", validationRules.JsValidateRange[0].rule), "12"); + }); + + test("ssn", function() { + ok( $.fn.validate.validateRule("555-55-5555", validationRules.JsValidateSsn[0].rule), "555-55-5555"); + ok( !$.fn.validate.validateRule("5a5-55-5555", validationRules.JsValidateSsn[0].rule), "55-5a5-5555"); + }); + + test("url", function() { + ok( $.fn.validate.validateRule("www.pseudocoder.com", validationRules.JsValidateUrl[0].rule), "www.pseudocoder.com"); + ok( $.fn.validate.validateRule("http://cakephp.org", validationRules.JsValidateUrl[0].rule), "http://cakephp.org"); + ok( !$.fn.validate.validateRule("ww.zendcm", validationRules.JsValidateUrl[0].rule), "ww.zendcm"); + }); +}); \ No newline at end of file vendors/js/unit_tests.js @@ -1,12 +1,10 @@ +<?php $javascript->codeBlock('var validationRules = ' . $validation->bind('JsValidate', array('form' => false)) . ';', + array('inline' => false)); ?> + <?php echo $javascript->link(array('http://jqueryjs.googlecode.com/svn/trunk/qunit/testrunner.js', - '/js_validate/js/jquery.validation')); ?> -<?php echo $html->css(array('http://jqueryjs.googlecode.com/svn/trunk/qunit/testsuite.css')); ?> - -<script type="text/javascript"> - var validationRules = <?php echo $validation->bind('JsValidate', array('form' => false)) ?>; -</script> - -<?php echo $javascript->link(array('/js_validate/js/unit_tests')); ?> + '/js_validate/js/unit_tests'), + false); ?> +<?php echo $html->css(array('http://jqueryjs.googlecode.com/svn/trunk/qunit/testsuite.css'), null, null, false); ?> <h1>CakePHP jQuery Validation Unit Tests</h1> <h2 id="banner"></h2> views/js_validate/test.ctp 722cb7a2b3c51d09835f7c16bcd038556dac5e46 unknown matt@mcurry.net http://github.com/mcurry/js_validate/commit/f4d52ffec0f9fe5f5fc50264ebef0f5602a52214 f4d52ffec0f9fe5f5fc50264ebef0f5602a52214 2009-05-01T22:32:11-07:00 2009-05-01T22:32:11-07:00 finished unit tests 716b3d6ad1357407c263eee63158d942866fd06c unknown matt@mcurry.net