nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'email-validation' of https://github.com/themasch/diaspora into themasch-email-validation

Browse source
This commit is contained in:
MrZYX 2010-12-13 22:49:50 +01:00
commit 045ba7c419
2 changed files with 30 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
public/javascripts/validation.js
View file

@ -7,6 +7,9 @@ var Validation = {
username: { username: {
characters: /^(|[A-Za-z0-9_]{0,32})$/, characters: /^(|[A-Za-z0-9_]{0,32})$/,
length: [6, 32] length: [6, 32]
},
email: {
characters: /^(([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,}))(, *(([\w\.%\+\-]+)@([\w\-]+\.)+([\w]{2,})))*$/
} }
}, },
events: { events: {
@ -15,10 +18,19 @@ var Validation = {
if(!Validation.rules.username.characters.test(this.value + String.fromCharCode(evt.keyCode))) { if(!Validation.rules.username.characters.test(this.value + String.fromCharCode(evt.keyCode))) {
evt.preventDefault(); evt.preventDefault();
} }
},
emailKeypress: function(evt) {
if(evt.keyCode === 0) { return; }
if(!Validation.rules.email.characters.test(this.value + String.fromCharCode(evt.keyCode))) {
$('#user_email').css('border-color', '#8B0000');
} else {
$('#user_email').css('border-color', '#666666');
}
} }
} }
}; };
$(function() { $(function() {
$("#user_username").keypress(Validation.events.usernameKeypress); $("#user_username").keypress(Validation.events.usernameKeypress);
$("#user_email").keypress(Validation.events.emailKeypress);
}); });

18
spec/javascripts/validation-spec.js
View file

@ -7,6 +7,13 @@ describe("Validation", function() {
}); });
}); });
}); });
describe("email", function() {
describe("characters", function() {
it("is the regex for checking if the input is a valid list of e-mail addresses", function() {
expect((typeof Validation.rules.email.characters.test === "function")).toBeTruthy();
});
});
});
}); });
describe("events", function() { describe("events", function() {
describe("usernameKeypress", function() { describe("usernameKeypress", function() {
@ -16,5 +23,16 @@ describe("Validation", function() {
expect(Validation.rules.username.characters.test("ffffffffffffffffffffffffffffffffff")).toBeFalsy(); expect(Validation.rules.username.characters.test("ffffffffffffffffffffffffffffffffff")).toBeFalsy();
}); });
}); });
describe("emailKeypress", function() {
it("colors the border red if the input seems to be a invalid list", function() {
expect(Validation.rules.email.characters.test("user@example.com")).toBeTruthy();
expect(Validation.rules.email.characters.test("user@example.com, user@example.com")).toBeTruthy();
expect(Validation.rules.email.characters.test("user@example.com, user@example.com, user@example.com")).toBeTruthy();
expect(Validation.rules.email.characters.test("user@example.com user@example.com")).toBeFalsy();
expect(Validation.rules.email.characters.test("user@examplecom")).toBeFalsy();
expect(Validation.rules.email.characters.test("userexample.com")).toBeFalsy();
expect(Validation.rules.email.characters.test("userexamplecom")).toBeFalsy();
});
});
}); });
}); });