commit be0903c71a1851a4d13df9de37a2037e7bc431ec
parent 3cee9b77869087a0e29ec14e43c407778c2f07ee
Author: bep <bjorn.erik.pedersen@gmail.com>
Date: Sun, 31 May 2015 18:54:50 +0200
Fix FullFilePath
Fixes #732
Diffstat:
2 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/hugolib/page.go b/hugolib/page.go
@@ -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) {
diff --git a/hugolib/page_test.go b/hugolib/page_test.go
@@ -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())
}
}
}