Fix FullFilePath

Fixes #732

diff --git a/hugolib/page.go b/hugolib/page.go
index 8cb28e0355bcdd7c2117afb8e25f03ed12d3c5ac..4abc09c5817169aed4d260accbe3521c31abe78a 100644 (file)
--- 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
index 9a65cff47032248f13f8462767d1c1377f56f448..2bf078f1872348d90f4027d87ddb80e4e272e594 100644 (file)
--- 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())
                }
        }
 }