Skip to content

Commit

Permalink
Fix unit test execution, update libs and fix cleaning error messages …
Browse files Browse the repository at this point in the history 
…within shadow DOM
  • Loading branch information
@elo7-developer
Luiz Corte Real and Tiago Celestino authored and elo7-developer committed Oct 11, 2017
1 parent 512e906 commit 25e5b58
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 12 deletions.
6 changes: 3 additions & 3 deletions form.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ define('form', ['doc'], function($) {
var isIE8 = (navigator.userAgent.toString().toLowerCase().indexOf('trident/4.0') != -1);
var isMobile = (function(){
var nav = navigator.userAgent||navigator.vendor||window.opera;
if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(nav) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(nav.substr(0,4))){
if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(nav) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd-(m|p|t)|hei-|hi(pt|ta)|hp( i|ip)|hs-c|ht(c(-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i-(20|go|ma)|i230|iac( |-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|-[a-w])|libw|lynx|m1-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|-([1-8]|c))|phil|pire|pl(ay|uc)|pn-2|po(ck|rt|se)|prox|psio|pt-g|qa-a|qc(07|12|21|32|60|-[2-7]|i-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h-|oo|p-)|sdk\/|se(c(-|0|1)|47|mc|nd|ri)|sgh-|shar|sie(-|m)|sk-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h-|v-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl-|tdg-|tel(i|m)|tim-|t-mo|to(pl|sh)|ts(70|m-|m3|m5)|tx-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas-|your|zeto|zte-/i.test(nav.substr(0,4))){
return true;
}
return false;
Expand Down Expand Up @@ -111,7 +111,7 @@ define('form', ['doc'], function($) {
});

form.find('[type="email"]').each(function(element){
var pattern = new RegExp(/^(([^<>()[\]\\.,;:\s@\"]+(\.[^<>()[\]\\.,;:\s@\"]+)*)|(\".+\"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);
var pattern = new RegExp(/^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/);

if (($(element).val()) && !pattern.test($(element).val())) {
var parent = element.parentElement;
Expand All @@ -131,7 +131,7 @@ define('form', ['doc'], function($) {
if (!valid){
form.addClass('has-errors');

var visibleErrorFields = $('.error input, .error textarea').filter(function(field) {
var visibleErrorFields = form.find('.error input, .error textarea').filter(function(field) {
return $(field).attr('type') !== 'hidden';
});

Expand Down
16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@
},
"author": "Elo7",
"dependency": {
"doc-amd": "1.0.6"
"doc-amd": "1.3.1"
},
"devDependencies": {
"bower": "1.4.1",
"eslint": "2.7.0",
"http-server": "0.7.4",
"mocha": "2.0.1",
"mocha-phantomjs": "3.5.1",
"phantomjs": "1.9.19",
"proclaim": "2.0.0"
"bower": "1.8.2",
"eslint": "4.8.0",
"http-server": "0.10.0",
"mocha": "4.0.1",
"mocha-phantomjs": "4.1.0",
"phantomjs": "2.1.7",
"proclaim": "3.4.6"
}
}
2 changes: 1 addition & 1 deletion test.sh
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

./node_modules/mocha-phantomjs/bin/mocha-phantomjs -R spec "http://localhost:8888/test/formTest.js.html";
./node_modules/mocha-phantomjs/bin/mocha-phantomjs -R spec -p ./node_modules/.bin/phantomjs "http://localhost:8888/test/formTest.js.html";
34 changes: 34 additions & 0 deletions test/formTest.js.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
<form id="formSucess" action="#">
<input value="a" required>
</form>

<div id="form-shadow-root"></div>
</div>

<script src="/node_modules/mocha/mocha.js"></script>
Expand Down Expand Up @@ -224,6 +226,38 @@
assert.equal($('#label6').find('.validation-message').isEmpty(), true);
assert.equal($('#label8').find('.validation-message').isEmpty(), true);
});
describe('Form with shadow root', function() {

var $root, $form;

before(function() {
if(!HTMLElement.prototype.createShadowRoot) {
this.skip();
}
$root = $($('#form-shadow-root').first().createShadowRoot());
$root.append($('#formClearMessages').first().cloneNode(true));
$form = $root.find('#formClearMessages');
});

it('should clear validation message', function() {
form.validate($form);
$form.trigger('submit');

assert.equal($root.find('.validation-message').isEmpty(), false);

form.removeValidationErrors($form.first());
assert.equal($root.find('.validation-message').isEmpty(), true);
});

it('should clear validation message after input', function() {
form.validate($form);
$form.trigger('submit');

assert.equal($root.find('#label1 .validation-message').isEmpty(), false);
$form.find('#label1 input').trigger('input');
assert.equal($root.find('#label1 .validation-message').isEmpty(), true);
});
});
});
});
</script>
Expand Down

0 comments on commit 25e5b58

Please sign in to comment.