From: bep <bjorn.erik.pedersen@gmail.com>
Date: Sun, 31 May 2015 16:54:50 +0000 (+0200)
Subject: Fix FullFilePath
X-Git-Tag: v0.15~364
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=be0903c71a1851a4d13df9de37a2037e7bc431ec;p=brevno-suite%2Fhugo

Fix FullFilePath

Fixes #732
---

diff --git a/hugolib/page.go b/hugolib/page.go
index 8cb28e03..4abc09c5 100644
--- 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 9a65cff4..2bf078f1 100644
--- 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())
 		}
 	}
 }