Commitba53cc4

authored and

committed

Improve test cases for file resolution (#233)

1 parentbcc60f5 commitba53cc4Copy full SHA for ba53cc4

File tree

-6

lines changed

-6

lines changed

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -227,27 +227,27 @@ func Test_Box_HasDir(t *testing.T) {`
`227`	`227`	`funcTest_Box_Traversal_Standard(t*testing.T) {`
`228`	`228`	`r:=require.New(t)`
`229`	`229`	`box:=New("Test_Box_Traversal_Standard","")`
`230`		`-_,err:=box.FindString("../go.mod")`
	`230`	`+_,err:=box.FindString("../fixtures/hello.txt")`
`231`	`231`	`r.Error(err)`
`232`	`232`	`}`
`233`	`233`
`234`	`234`	`funcTest_Box_Traversal_Standard_Depth2(t*testing.T) {`
`235`	`235`	`r:=require.New(t)`
`236`	`236`	`box:=New("Test_Box_Traversal_Standard_Depth2","")`
`237`		`-_,err:=box.FindString("../../packr/go.mod")`
	`237`	`+_,err:=box.FindString("../../packr/fixtures/hello.txt")`
`238`	`238`	`r.Error(err)`
`239`	`239`	`}`
`240`	`240`
`241`	`241`	`funcTest_Box_Traversal_Backslash(t*testing.T) {`
`242`	`242`	`r:=require.New(t)`
`243`	`243`	`box:=New("Test_Box_Traversal_Backslash","")`
`244`		`-_,err:=box.FindString("..\\go.mod")`
	`244`	`+_,err:=box.FindString("..\\fixtures\\hello.txt")`
`245`	`245`	`r.Error(err)`
`246`	`246`	`}`
`247`	`247`
`248`	`248`	`funcTest_Box_Traversal_Backslash_Depth2(t*testing.T) {`
`249`	`249`	`r:=require.New(t)`
`250`	`250`	`box:=New("Test_Box_Traversal_Backslash_Depth2","")`
`251`		`-_,err:=box.FindString("..\\..packr2\\go.mod")`
	`251`	`+_,err:=box.FindString("..\\..\\packr2\\fixtures\\hello.txt")`
`252`	`252`	`r.Error(err)`
`253`	`253`	`}`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ func (d *Disk) Resolve(box string, name string) (file.File, error) {`
`45`	`45`	`returnnil,os.ErrNotExist`
`46`	`46`	`}`
`47`	`47`
`48`		`-//resolvePathInBase returns a path that is guaranteed to be inside of the base directory or an error`
`49`		`-funcResolvePathInBase(basestring,pathstring) (string,error) {`
	`48`	`+//ResolvePathInBase returns a path that is guaranteed to be inside of the base directory or an error`
	`49`	`+funcResolvePathInBase(base,pathstring) (string,error) {`
`50`	`50`	`// Determine the absolute file path of the base directory`
`51`	`51`	`d,err:=filepath.Abs(base)`
`52`	`52`	`iferr!=nil {`

Comments

(0)