github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-07 20:30:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

Fix FullFilePath

Browse source 
Fixes #732
This commit is contained in:
bep 2015-05-31 18:54:50 +02:00
parent 3cee9b7786
commit be0903c71a
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hugolib/page.go
View file

@ -800,7 +800,7 @@ func (p *Page) Convert() error {
}
func (p *Page) FullFilePath() string {
return filepath.Join(p.Source.Dir(), p.Source.Path())
return filepath.Join(p.Dir(), p.LogicalName())
}
func (p *Page) TargetPath() (outfile string) {

13
hugolib/page_test.go
View file

@ -667,7 +667,7 @@ func TestSliceToLower(t *testing.T) {
}
}
func TestTargetPath(t *testing.T) {
func TestPagePaths(t *testing.T) {
viper.Reset()
defer viper.Reset()
@ -700,10 +700,15 @@ func TestTargetPath(t *testing.T) {
p.Node.Site.Permalinks = site_permalinks_setting
}
expected := filepath.FromSlash(test.expected)
expectedTargetPath := filepath.FromSlash(test.expected)
expectedFullFilePath := filepath.FromSlash(test.path)
if p.TargetPath() != expected {
t.Errorf("%s => TargetPath expected: '%s', got: '%s'", test.content, expected, p.TargetPath())
if p.TargetPath() != expectedTargetPath {
t.Errorf("%s => TargetPath expected: '%s', got: '%s'", test.content, expectedTargetPath, p.TargetPath())
}
if p.FullFilePath() != expectedFullFilePath {
t.Errorf("%s => FullFilePath expected: '%s', got: '%s'", test.content, expectedFullFilePath, p.FullFilePath())
}
}
}