Merge pull request #65 from bluesuncorp/v5-development

V5 development
pull/66/head v5.6.1
Dean Karn 10 years ago
commit c6a510f8a9
  1. 6
      validator.go
  2. 5
      validator_test.go

@ -438,7 +438,7 @@ func (v *Validate) fieldWithNameAndValue(val interface{}, current interface{}, f
param := "" param := ""
if len(vals) > 1 { if len(vals) > 1 {
param = strings.TrimSpace(vals[1]) param = vals[1]
} }
cTag.keyVals[i] = []string{key, param} cTag.keyVals[i] = []string{key, param}
@ -506,7 +506,8 @@ func (v *Validate) fieldWithNameAndSingleTag(val interface{}, current interface{
if err := valFunc(val, current, f, param); err { if err := valFunc(val, current, f, param); err {
return nil, nil return nil, nil
} else { }
return &FieldError{ return &FieldError{
Field: name, Field: name,
Tag: key, Tag: key,
@ -514,4 +515,3 @@ func (v *Validate) fieldWithNameAndSingleTag(val interface{}, current interface{
Param: param, Param: param,
}, errors.New(key) }, errors.New(key)
} }
}

@ -276,6 +276,11 @@ func TestExcludesAllValidation(t *testing.T) {
t.Fatalf("Index: %d failed Error: %s", i, errs) t.Fatalf("Index: %d failed Error: %s", i, errs)
} }
} }
username := "joeybloggs "
err := validate.Field(username, "excludesall=@ ")
NotEqual(t, err, nil)
} }
func TestExcludesValidation(t *testing.T) { func TestExcludesValidation(t *testing.T) {

Loading…
Cancel
Save