shithub: hugo

Info  •  Files  •  Log  •  Branches

Fix FullFilePath

Fixes #732

--- a/hugolib/page.go

+++ b/hugolib/page.go

@@ -800,7 +800,7 @@

 }

 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) {

--- a/hugolib/page_test.go

+++ b/hugolib/page_test.go

@@ -667,7 +667,7 @@

 	}

 }

-func TestTargetPath(t *testing.T) {

+func TestPagePaths(t *testing.T) {

 	viper.Reset()

 	defer viper.Reset()

@@ -700,10 +700,15 @@

 			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())

 		}

 	}

 }