ref: a4eef4eb16f099a17181e2a9fa38262aafcd87f5
parent: 78e9229c52dfdaf335673b171a3d66fc1ace8d9e
author: Anthony Fok <[email protected]>
date: Sat Jan 10 21:21:51 EST 2015
Correct spelling of two test files: seperators → separators
--- /dev/null
+++ b/hugolib/path_separators_test.go
@@ -1,0 +1,54 @@
+package hugolib
+
+import (
+ "path/filepath"
+ "strings"
+ "testing"
+)
+
+var SIMPLE_PAGE_YAML = `---
+contenttype: ""
+---
+Sample Text
+`
+
+func TestDegenerateMissingFolderInPageFilename(t *testing.T) {+ p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), filepath.Join("foobar"))+ if err != nil {+ t.Fatalf("Error in NewPageFrom")+ }
+ if p.Section() != "" {+ t.Fatalf("No section should be set for a file path: foobar")+ }
+}
+
+func TestNewPageWithFilePath(t *testing.T) {+ toCheck := []struct {+ input string
+ section string
+ layout []string
+ }{+ {filepath.Join("sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")},+ {filepath.Join("content", "foobar.html"), "", L("page/single.html", "_default/single.html")},+ {filepath.Join("content", "sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")},+ {filepath.Join("content", "dub", "sub", "foobar.html"), "dub", L("dub/single.html", "_default/single.html")},+ }
+
+ for _, el := range toCheck {+ p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), el.input)
+ if err != nil {+ t.Errorf("Reading from SIMPLE_PAGE_YAML resulted in an error: %s", err)+ }
+ if p.Section() != el.section {+ t.Errorf("Section not set to %s for page %s. Got: %s", el.section, el.input, p.Section())+ }
+
+ for _, y := range el.layout {+ el.layout = append(el.layout, "theme/"+y)
+ }
+
+ if !listEqual(p.Layout(), el.layout) {+ t.Errorf("Layout incorrect. Expected: '%s', Got: '%s'", el.layout, p.Layout())+ }
+ }
+}
--- /dev/null
+++ b/hugolib/path_separators_windows_test.go
@@ -1,0 +1,18 @@
+package hugolib
+
+import (
+ "github.com/spf13/hugo/tpl"
+ "testing"
+)
+
+const (
+ win_base = "c:\\a\\windows\\path\\layout"
+ win_path = "c:\\a\\windows\\path\\layout\\sub1\\index.html"
+)
+
+func TestTemplatePathSeperator(t *testing.T) {+ tmpl := new(tpl.GoHtmlTemplate)
+ if name := tmpl.GenerateTemplateNameFrom(win_base, win_path); name != "sub1/index.html" {+ t.Fatalf("Template name incorrect. Expected: %s, Got: %s", "sub1/index.html", name)+ }
+}
--- a/hugolib/path_seperators_test.go
+++ /dev/null
@@ -1,54 +1,0 @@
-package hugolib
-
-import (
- "path/filepath"
- "strings"
- "testing"
-)
-
-var SIMPLE_PAGE_YAML = `---
-contenttype: ""
----
-Sample Text
-`
-
-func TestDegenerateMissingFolderInPageFilename(t *testing.T) {- p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), filepath.Join("foobar"))- if err != nil {- t.Fatalf("Error in NewPageFrom")- }
- if p.Section() != "" {- t.Fatalf("No section should be set for a file path: foobar")- }
-}
-
-func TestNewPageWithFilePath(t *testing.T) {- toCheck := []struct {- input string
- section string
- layout []string
- }{- {filepath.Join("sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")},- {filepath.Join("content", "foobar.html"), "", L("page/single.html", "_default/single.html")},- {filepath.Join("content", "sub", "foobar.html"), "sub", L("sub/single.html", "_default/single.html")},- {filepath.Join("content", "dub", "sub", "foobar.html"), "dub", L("dub/single.html", "_default/single.html")},- }
-
- for _, el := range toCheck {- p, err := NewPageFrom(strings.NewReader(SIMPLE_PAGE_YAML), el.input)
- if err != nil {- t.Errorf("Reading from SIMPLE_PAGE_YAML resulted in an error: %s", err)- }
- if p.Section() != el.section {- t.Errorf("Section not set to %s for page %s. Got: %s", el.section, el.input, p.Section())- }
-
- for _, y := range el.layout {- el.layout = append(el.layout, "theme/"+y)
- }
-
- if !listEqual(p.Layout(), el.layout) {- t.Errorf("Layout incorrect. Expected: '%s', Got: '%s'", el.layout, p.Layout())- }
- }
-}
--- a/hugolib/path_seperators_windows_test.go
+++ /dev/null
@@ -1,18 +1,0 @@
-package hugolib
-
-import (
- "github.com/spf13/hugo/tpl"
- "testing"
-)
-
-const (
- win_base = "c:\\a\\windows\\path\\layout"
- win_path = "c:\\a\\windows\\path\\layout\\sub1\\index.html"
-)
-
-func TestTemplatePathSeperator(t *testing.T) {- tmpl := new(tpl.GoHtmlTemplate)
- if name := tmpl.GenerateTemplateNameFrom(win_base, win_path); name != "sub1/index.html" {- t.Fatalf("Template name incorrect. Expected: %s, Got: %s", "sub1/index.html", name)- }
-}