Merge pull request #163 from erizocosmico/fix/windows

fix windows tests and behaviour
src-d · May 16, 2017 · df7d54f · df7d54f
2 parents 8c64e54 + b771a39
commit df7d54f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -2,6 +2,7 @@ version: build-{build}.{branch}
 platform: x64
 
 clone_folder: c:\gopath\src\gopkg.in\src-d\go-kallax.v1
+
 shallow_clone: true
 
 environment:

diff --git a/generator/types.go b/generator/types.go
@@ -892,7 +892,7 @@ func castSlice(f *Field) (cast string, ok bool) {
 
 func typeString(ty types.Type, pkg *types.Package) string {
 	ret := types.TypeString(ty, types.RelativeTo(pkg))
-	parts := strings.Split(ret, "/")
+	parts := strings.Split(ret, string(separator))
 	prefix := ""
 	if len(parts) > 1 {
 		for _, r := range parts[0] {

diff --git a/timestamps_test.go b/timestamps_test.go
@@ -2,6 +2,7 @@ package kallax
 
 import (
 	"testing"
+	"time"
 
 	"github.com/stretchr/testify/require"
 )
@@ -18,7 +19,8 @@ func TestTimestampsBeforeSave(t *testing.T) {
 	s.False(ts.UpdatedAt.IsZero())
 
 	createdAt := ts.CreatedAt
-	updatedAt := ts.CreatedAt
+	updatedAt := ts.UpdatedAt
+	time.Sleep(50 * time.Millisecond)
 	s.NoError(ts.BeforeSave())
 	s.Equal(createdAt, ts.CreatedAt)
 	s.NotEqual(updatedAt, ts.UpdatedAt)