Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-07 22:15:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #163)Fixed

Browse Source
This commit is contained in:
takezoe
2013-10-19 18:48:50 +09:00
parent 41941df87a
commit 7c7da7379d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/util/Validations.scala
View File

@@ -9,7 +9,7 @@ trait Validations {
*/ */
def identifier: Constraint = new Constraint(){ def identifier: Constraint = new Constraint(){
override def validate(name: String, value: String): Option[String] = override def validate(name: String, value: String): Option[String] =
if(!value.matches("^[a-zA-Z0-9\\\\-_.]+$")){ if(!value.matches("^[a-zA-Z0-9\\-_\\.]+$")){
Some(s"${name} contains invalid character.") Some(s"${name} contains invalid character.")
} else if(value.startsWith("_") || value.startsWith("-")){ } else if(value.startsWith("_") || value.startsWith("-")){
Some(s"${name} starts with invalid character.") Some(s"${name} starts with invalid character.")

5
src/test/scala/util/ValidationsSpec.scala
View File

@@ -2,11 +2,12 @@ package util
import org.specs2.mutable._ import org.specs2.mutable._
class ValidationsSpec extends Specification with Validations { class
ValidationsSpec extends Specification with Validations {
"identifier" should { "identifier" should {
"validate id string " in { "validate id string " in {
identifier.validate("id", "aa_ZZ-01") mustEqual None identifier.validate("id", "aa_ZZ-00.01") mustEqual None
identifier.validate("id", "_aaaa") mustEqual Some("id starts with invalid character.") identifier.validate("id", "_aaaa") mustEqual Some("id starts with invalid character.")
identifier.validate("id", "-aaaa") mustEqual Some("id starts with invalid character.") identifier.validate("id", "-aaaa") mustEqual Some("id starts with invalid character.")
identifier.validate("id", "aa_ZZ#01") mustEqual Some("id contains invalid character.") identifier.validate("id", "aa_ZZ#01") mustEqual Some("id contains invalid character.")