Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

@Phone @IPv4Address @IPv6Address validators plus test units #50

Closed
wants to merge 15 commits into from
Closed

Conversation

orefalo
Copy link
Contributor

@orefalo orefalo commented Dec 8, 2010

Desole pour les differents commits, j'apprends GIT et ce n'est pas facile!

Discussion @ http://groups.google.com/group/play-framework/browse_thread/thread/9cf9085e49aa800a

@guillaumebort
Copy link
Contributor

Ok I will rebase it. Can you please:

update the documentation page, at http://www.playframework.org/documentation/1.1/validation-builtin, and add the corresponding methods to play.data.validation.Validation

@orefalo
Copy link
Contributor Author

orefalo commented Dec 8, 2010

hum.. can u teach me how you rebase these changes ?
Let me ask this in another way.. is there anything I can do to bundle all these commit as ONE.
The only way I see it today is killing my fork, rebranching and adding my changes again.

-> will work on the changes later today.

@guillaumebort
Copy link
Contributor

You can merge all this commits into only one using git rebase, http://book.git-scm.com/4_rebasing.html

Basically you have to type:

git rebase -i origin/master

And then edit your commits. But don't worry, I can do it for you if you want.

@guillaumebort
Copy link
Contributor

Sorry, the correct book page is http://book.git-scm.com/4_interactive_rebasing.html

@orefalo
Copy link
Contributor Author

orefalo commented Dec 8, 2010

Guillaume, I believe I an done. I tried to itemized the commits as much as possible for ease of reading (except fo the first ones which were a mess :/ )

on top of the phone and ip validators, I also added a missing method for validation.url (along with a doc update) and added a reference to my sheet cheat in home.textile

@guillaumebort
Copy link
Contributor

Ok I'll integrate it ASAP

@guillaumebort
Copy link
Contributor

Sorry but the PhoneValidationTest fails for me. Can you check again?

@orefalo
Copy link
Contributor Author

orefalo commented Dec 18, 2010

Will do tomorrow. Just to confirm, how did you test ? your branch + my changes ?
or using my branch ?

Either ways, I will give it another shot tomorrow... and probably pull the latest changes from HEAD

Olivier

@orefalo
Copy link
Contributor Author

orefalo commented Dec 19, 2010

Just checked and everything is fine.

Here are the results from a Fresh play clone:
[exec] ~ RestTest... PASSED 3s
[exec] ~ CacheTest... PASSED 5s
[exec] ~ FixturesTest... PASSED 0s
[exec] ~ OpenIDTest... PASSED 0s
[exec] ~ CascadeTest... PASSED 0s
[exec] ~ DirectBindingTest... PASSED 0s
[exec] ~ SimpleJPATest... FAILED ! 0s
[exec] ~ models/OptimisticLockingModelPlayTest... PASSED 0s
[exec] ~ FunctionalTestTest/AnotherInnerTest... PASSED 0s
[exec] ~ TransactionalJPATest... PASSED 0s
[exec] ~ BinaryTest... PASSED 0s
[exec] ~ ApplicationTest... PASSED 0s
[exec] ~ FunctionalTestTest... PASSED 0s
[exec] ~ after... PASSED 2s
[exec] ~ alertConfirmPrompt... PASSED 2s
[exec] ~ authenticity... PASSED 2s
[exec] ~ before... PASSED 2s
[exec] ~ binding... FAILED ! 2s
[exec] ~ cache... PASSED 8s
[exec] ~ catch... PASSED 1s
[exec] ~ complexBinding... PASSED 4s
[exec] ~ compositeMapBinding... PASSED 2s
[exec] ~ CRUD... PASSED 7s
[exec] ~ dumbSelenium... PASSED 1s
[exec] ~ errors... PASSED 2s
[exec] ~ escape... PASSED 1s
[exec] ~ fields... PASSED 1s
[exec] ~ finally... PASSED 1s
[exec] ~ flash... PASSED 1s
[exec] ~ ifthenelse... PASSED 2s
[exec] ~ invocationContext... PASSED 1s
[exec] ~ JPABinding... PASSED 3s
[exec] ~ JPASave... PASSED 4s
[exec] ~ list... PASSED 2s
[exec] ~ mailer... PASSED 2s
[exec] ~ routing... PASSED 3s
[exec] ~ selectTag... PASSED 2s
[exec] ~ seleniumUserExtensions... PASSED 1s
[exec] ~ simpleBinding... PASSED 3s
[exec] ~ simpleEditBinding... PASSED 3s
[exec] ~ tagContexts... PASSED 1s
[exec] ~ templateTricks... PASSED 2s
[exec] ~ validation... PASSED 2s

Here are the results of my fork:
[exec] ~ 45 tests to run:
[exec] ~
[exec] ~ RestTest... PASSED 3s
[exec] ~ IPValidationTest... PASSED 0s
[exec] ~ CacheTest... PASSED 5s
[exec] ~ FixturesTest... PASSED 0s
[exec] ~ OpenIDTest... PASSED 0s
[exec] ~ CascadeTest... PASSED 0s
[exec] ~ DirectBindingTest... PASSED 0s
[exec] ~ SimpleJPATest... FAILED ! 0s
[exec] ~ PhoneValidationTest... PASSED 0s
[exec] ~ models/OptimisticLockingModelPlayTest... PASSED 0s
[exec] ~ FunctionalTestTest/AnotherInnerTest... PASSED 0s
[exec] ~ TransactionalJPATest... PASSED 0s
[exec] ~ BinaryTest... PASSED 0s
[exec] ~ ApplicationTest... PASSED 0s
[exec] ~ FunctionalTestTest... PASSED 0s
[exec] ~ after... PASSED 2s
[exec] ~ alertConfirmPrompt... PASSED 2s
[exec] ~ authenticity... PASSED 2s
[exec] ~ before... PASSED 2s
[exec] ~ binding... FAILED ! 2s
[exec] ~ cache... PASSED 8s
[exec] ~ catch... PASSED 1s
[exec] ~ complexBinding... PASSED 4s
[exec] ~ compositeMapBinding... PASSED 2s
[exec] ~ CRUD... PASSED 7s
[exec] ~ dumbSelenium... PASSED 1s
[exec] ~ errors... PASSED 2s
[exec] ~ escape... PASSED 1s
[exec] ~ fields... PASSED 1s
[exec] ~ finally... PASSED 1s
[exec] ~ flash... PASSED 2s
[exec] ~ ifthenelse... PASSED 2s
[exec] ~ invocationContext... PASSED 1s
[exec] ~ JPABinding... PASSED 3s
[exec] ~ JPASave... PASSED 4s
[exec] ~ list... PASSED 2s
[exec] ~ mailer... PASSED 1s
[exec] ~ routing... PASSED 3s
[exec] ~ selectTag... PASSED 1s
[exec] ~ seleniumUserExtensions... PASSED 1s
[exec] ~ simpleBinding... PASSED 3s
[exec] ~ simpleEditBinding... PASSED 2s
[exec] ~ tagContexts... PASSED 1s
[exec] ~ templateTricks... PASSED 1s
[exec] ~ validation... PASSED 1s

you will notice that SimpleJPATest and binding are failing. but they were failing to begin with.

Please advise,
Olivier

@guillaumebort
Copy link
Contributor

Yes the tests are broken after the merge. Btw the merge is very complicated to do with a lot of conflicts... I'll try again.

@guillaumebort
Copy link
Contributor

Done.

@orefalo
Copy link
Contributor Author

orefalo commented Dec 19, 2010

Merci Guillaume.

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants