From d60133c8e7cb2219a109eb6ea5d1d5b3cea35190 Mon Sep 17 00:00:00 2001
From: Mark Bates <mark@markbates.com>
Date: Sat, 22 Sep 2018 13:55:43 -0400
Subject: [PATCH] fixes tests on windows

---
 v2/box.go                 | 3 +++
 v2/box_test.go            | 3 +--
 v2/jam/parser/prospect.go | 4 +++-
 v2/jam/store/disk_test.go | 9 +++++----
 v2/walk.go                | 3 +--
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/v2/box.go b/v2/box.go
index 5f2b419..57aa2c8 100644
--- a/v2/box.go
+++ b/v2/box.go
@@ -133,6 +133,9 @@ func (b Box) List() []string {
 	var keys []string
 
 	b.Walk(func(path string, info File) error {
+		if info == nil {
+			return nil
+		}
 		finfo, _ := info.FileInfo()
 		if !finfo.IsDir() {
 			keys = append(keys, finfo.Name())
diff --git a/v2/box_test.go b/v2/box_test.go
index 86ca3bd..a5352c3 100644
--- a/v2/box_test.go
+++ b/v2/box_test.go
@@ -156,10 +156,9 @@ func Test_Box_MustBytes_Miss(t *testing.T) {
 	r := require.New(t)
 
 	box := NewBox("./_fixtures/templates")
-
 	s, err := box.MustBytes("foo.txt")
 	r.NoError(err)
-	r.Equal("FOO!!!\n", string(s))
+	r.Equal("FOO!!!", strings.TrimSpace(string(s)))
 
 	s, err = box.MustBytes("idontexist")
 	r.Error(err)
diff --git a/v2/jam/parser/prospect.go b/v2/jam/parser/prospect.go
index 4726bd3..b441eac 100644
--- a/v2/jam/parser/prospect.go
+++ b/v2/jam/parser/prospect.go
@@ -4,6 +4,8 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"github.com/gobuffalo/packr/v2/file/resolver"
 )
 
 var DefaultIgnoredFolders = []string{"vendor", ".git", "node_modules", ".idea", "_fixtures"}
@@ -34,7 +36,7 @@ func IsProspect(path string, ignore ...string) bool {
 		ignore[i] = strings.TrimSpace(strings.ToLower(x))
 	}
 
-	parts := strings.Split(path, string(filepath.Separator))
+	parts := strings.Split(resolver.OsPath(path), string(filepath.Separator))
 	if len(parts) == 0 {
 		return false
 	}
diff --git a/v2/jam/store/disk_test.go b/v2/jam/store/disk_test.go
index 04e8c73..de10a82 100644
--- a/v2/jam/store/disk_test.go
+++ b/v2/jam/store/disk_test.go
@@ -2,6 +2,7 @@ package store
 
 import (
 	"path/filepath"
+	"strings"
 	"testing"
 
 	"github.com/gobuffalo/packr/v2"
@@ -39,11 +40,11 @@ func Test_Disk_Files(t *testing.T) {
 
 	f := files[0]
 	r.Equal("aretha.txt", filepath.Base(f.Name()))
-	r.Equal("RESPECT!\n", f.String())
+	r.Equal("RESPECT!", strings.TrimSpace(f.String()))
 
 	f = files[1]
 	r.Equal("think.txt", filepath.Base(f.Name()))
-	r.Equal("THINK!\n", f.String())
+	r.Equal("THINK!", strings.TrimSpace(f.String()))
 }
 
 func Test_Disk_Pack(t *testing.T) {
@@ -76,11 +77,11 @@ func Test_Disk_Packed_Test(t *testing.T) {
 
 	s, err := b.MustString("parents/homer.txt")
 	r.NoError(err)
-	r.Equal("HOMER Simpson\n", s)
+	r.Equal("HOMER Simpson", strings.TrimSpace(s))
 
 	s, err = b.MustString("parents/marge.txt")
 	r.NoError(err)
-	r.Equal("MARGE Simpson\n", s)
+	r.Equal("MARGE Simpson", strings.TrimSpace(s))
 
 	_, err = b.MustString("idontexist")
 	r.Error(err)
diff --git a/v2/walk.go b/v2/walk.go
index 3589226..40e32fc 100644
--- a/v2/walk.go
+++ b/v2/walk.go
@@ -43,8 +43,7 @@ func (b *Box) Walk(wf WalkFunc) error {
 	sort.Strings(keys)
 
 	for _, k := range keys {
-		k = resolver.OsPath(k)
-		if err := wf(k, m[k]); err != nil {
+		if err := wf(resolver.OsPath(k), m[k]); err != nil {
 			return errors.WithStack(err)
 		}
 	}