Skip to content

V6 development #118

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Jul 20, 2015
Merged

V6 development #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d078eb5
Merge pull request #117 from bluesuncorp/v6-development
Jul 20, 2015
506e57e
Merge remote-tracking branch 'upstream/v6-development' into v6-develo…
Jul 20, 2015
cdc48b4
Fix Bug in Ptr tests
Jul 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,9 @@ func (v *Validate) traverseField(topStruct reflect.Value, currentStruct reflect.
return
}

tags := strings.Split(tag, tagSeparator)

if len(tags) > 0 {
if len(tag) > 0 {

tags := strings.Split(tag, tagSeparator)
var param string
vals := strings.SplitN(tags[0], tagKeySeparator, 2)

Expand Down
16 changes: 14 additions & 2 deletions validator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,19 @@ func AssertError(t *testing.T, errs ValidationErrors, key, field, expectedTag st
EqualSkip(t, 2, val.Tag, expectedTag)
}

func TestDatePtrValidationIssueValidation(t *testing.T) {

type Test struct {
LastViewed *time.Time
Reminder *time.Time
}

test := &Test{}

errs := validate.Struct(test)
Equal(t, errs, nil)
}

func TestCommaAndPipeObfuscationValidation(t *testing.T) {
s := "My Name Is, |joeybloggs|"

Expand Down Expand Up @@ -634,13 +647,12 @@ func TestArrayDiveValidation(t *testing.T) {

errs = validate.Struct(tmsp)
NotEqual(t, errs, nil)
Equal(t, len(errs), 6)
Equal(t, len(errs), 5)
AssertError(t, errs, "TestMultiDimensionalStructsPtr.Errs[0][1].Name", "Name", "required")
AssertError(t, errs, "TestMultiDimensionalStructsPtr.Errs[0][2].Name", "Name", "required")
AssertError(t, errs, "TestMultiDimensionalStructsPtr.Errs[1][1].Name", "Name", "required")
AssertError(t, errs, "TestMultiDimensionalStructsPtr.Errs[1][2].Name", "Name", "required")
AssertError(t, errs, "TestMultiDimensionalStructsPtr.Errs[2][1].Name", "Name", "required")
AssertError(t, errs, "TestMultiDimensionalStructsPtr.Errs[2][2]", "Errs[2][2]", "")
// for full test coverage
fmt.Sprint(errs.Error())

Expand Down