Improve test cases for file resolution (#233)

gobuffalo · Aug 26, 2019 · ba53cc4 · ba53cc4
1 parent bcc60f5
commit ba53cc4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/v2/box_test.go b/v2/box_test.go
@@ -227,27 +227,27 @@ func Test_Box_HasDir(t *testing.T) {
 func Test_Box_Traversal_Standard(t *testing.T) {
 	r := require.New(t)
 	box := New("Test_Box_Traversal_Standard", "")
-	_, err := box.FindString("../go.mod")
+	_, err := box.FindString("../fixtures/hello.txt")
 	r.Error(err)
 }
 
 func Test_Box_Traversal_Standard_Depth2(t *testing.T) {
 	r := require.New(t)
 	box := New("Test_Box_Traversal_Standard_Depth2", "")
-	_, err := box.FindString("../../packr/go.mod")
+	_, err := box.FindString("../../packr/fixtures/hello.txt")
 	r.Error(err)
 }
 
 func Test_Box_Traversal_Backslash(t *testing.T) {
 	r := require.New(t)
 	box := New("Test_Box_Traversal_Backslash", "")
-	_, err := box.FindString("..\\go.mod")
+	_, err := box.FindString("..\\fixtures\\hello.txt")
 	r.Error(err)
 }
 
 func Test_Box_Traversal_Backslash_Depth2(t *testing.T) {
 	r := require.New(t)
 	box := New("Test_Box_Traversal_Backslash_Depth2", "")
-	_, err := box.FindString("..\\..packr2\\go.mod")
+	_, err := box.FindString("..\\..\\packr2\\fixtures\\hello.txt")
 	r.Error(err)
 }
diff --git a/v2/file/resolver/disk.go b/v2/file/resolver/disk.go
@@ -45,8 +45,8 @@ func (d *Disk) Resolve(box string, name string) (file.File, error) {
 	return nil, os.ErrNotExist
 }
 
-// resolvePathInBase returns a path that is guaranteed to be inside of the base directory or an error
-func ResolvePathInBase(base string, path string) (string, error) {
+// ResolvePathInBase returns a path that is guaranteed to be inside of the base directory or an error
+func ResolvePathInBase(base, path string) (string, error) {
 	// Determine the absolute file path of the base directory
 	d, err := filepath.Abs(base)
 	if err != nil {