github/hugo
1
0
Fork 0
mirror of https://github.com/gohugoio/hugo.git synced 2024-11-21 20:46:30 -05:00
Code Issues Projects Releases Packages Wiki Activity

create: Improve archetype directory discovery and tests

Browse source 
Updates #9146
This commit is contained in:
Bjørn Erik Pedersen 2021-11-12 10:29:13 +01:00
parent 057d02de25
commit 5f3f60898c
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
create/content.go
View file

@ -252,7 +252,8 @@ func (b *contentBuilder) setArcheTypeFilenameToUse(ext string) {
if b.kind != "" { if b.kind != "" {
pathsToCheck = append(pathsToCheck, b.kind+ext) pathsToCheck = append(pathsToCheck, b.kind+ext)
} }
pathsToCheck = append(pathsToCheck, "default"+ext, "default")
pathsToCheck = append(pathsToCheck, "default"+ext)
for _, p := range pathsToCheck { for _, p := range pathsToCheck {
fi, err := b.archeTypeFs.Stat(p) fi, err := b.archeTypeFs.Stat(p)

17
create/content_test.go
View file

@ -167,7 +167,9 @@ func TestNewContentFromDirSiteFunction(t *testing.T) {
c := qt.New(t) c := qt.New(t)
archetypeDir := filepath.Join("archetypes", "my-bundle") archetypeDir := filepath.Join("archetypes", "my-bundle")
defaultArchetypeDir := filepath.Join("archetypes", "default")
c.Assert(mm.MkdirAll(archetypeDir, 0o755), qt.IsNil) c.Assert(mm.MkdirAll(archetypeDir, 0o755), qt.IsNil)
c.Assert(mm.MkdirAll(defaultArchetypeDir, 0o755), qt.IsNil)
contentFile := ` contentFile := `
File: %s File: %s
@ -176,6 +178,7 @@ site RegularPages: {{ len site.RegularPages }}
` `
c.Assert(afero.WriteFile(mm, filepath.Join(archetypeDir, "index.md"), []byte(fmt.Sprintf(contentFile, "index.md")), 0o755), qt.IsNil) c.Assert(afero.WriteFile(mm, filepath.Join(archetypeDir, "index.md"), []byte(fmt.Sprintf(contentFile, "index.md")), 0o755), qt.IsNil)
c.Assert(afero.WriteFile(mm, filepath.Join(defaultArchetypeDir, "index.md"), []byte("default archetype index.md"), 0o755), qt.IsNil)
c.Assert(initFs(mm), qt.IsNil) c.Assert(initFs(mm), qt.IsNil)
cfg, fs := newTestCfg(c, mm) cfg, fs := newTestCfg(c, mm)
@ -185,8 +188,20 @@ site RegularPages: {{ len site.RegularPages }}
c.Assert(len(h.Sites), qt.Equals, 2) c.Assert(len(h.Sites), qt.Equals, 2)
c.Assert(create.NewContent(h, "my-bundle", "post/my-post"), qt.IsNil) c.Assert(create.NewContent(h, "my-bundle", "post/my-post"), qt.IsNil)
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/index.md")), `site RegularPages: 10`) cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post/index.md")), `site RegularPages: 10`)
// Default bundle archetype
c.Assert(create.NewContent(h, "", "post/my-post2"), qt.IsNil)
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/my-post2/index.md")), `default archetype index.md`)
// Regular file with bundle kind.
c.Assert(create.NewContent(h, "my-bundle", "post/foo.md"), qt.IsNil)
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "post/foo.md")), `draft: true`)
// Regular files should fall back to the default archetype (we have no regular file archetype).
c.Assert(create.NewContent(h, "my-bundle", "mypage.md"), qt.IsNil)
cContains(c, readFileFromFs(t, fs.Source, filepath.Join("content", "mypage.md")), `draft: true`)
} }
func TestNewContentFromDirNoSite(t *testing.T) { func TestNewContentFromDirNoSite(t *testing.T) {