commands: Add test for --configDir

See #5662
This commit is contained in:
Bjørn Erik Pedersen 2019-02-01 08:40:53 +01:00
parent 3244cb3b31
commit 59d87044a4
No known key found for this signature in database
GPG key ID: 330E6E2BD4859D8F
3 changed files with 76 additions and 8 deletions

View file

@ -30,7 +30,7 @@ func TestExecute(t *testing.T) {
assert := require.New(t)
dir, err := createSimpleTestSite(t)
dir, err := createSimpleTestSite(t, testSiteConfig{})
assert.NoError(err)
defer func() {
@ -140,7 +140,7 @@ func TestCommandsExecute(t *testing.T) {
assert := require.New(t)
dir, err := createSimpleTestSite(t)
dir, err := createSimpleTestSite(t, testSiteConfig{})
assert.NoError(err)
dirOut, err := ioutil.TempDir("", "hugo-cli-out")
@ -204,21 +204,37 @@ func TestCommandsExecute(t *testing.T) {
}
func createSimpleTestSite(t *testing.T) (string, error) {
type testSiteConfig struct {
configTOML string
contentDir string
}
func createSimpleTestSite(t *testing.T, cfg testSiteConfig) (string, error) {
d, e := ioutil.TempDir("", "hugo-cli")
if e != nil {
return "", e
}
// Just the basic. These are for CLI tests, not site testing.
writeFile(t, filepath.Join(d, "config.toml"), `
cfgStr := `
baseURL = "https://example.org"
title = "Hugo Commands"
`)
`
writeFile(t, filepath.Join(d, "content", "p1.md"), `
contentDir := "content"
if cfg.configTOML != "" {
cfgStr = cfg.configTOML
}
if cfg.contentDir != "" {
contentDir = cfg.contentDir
}
// Just the basic. These are for CLI tests, not site testing.
writeFile(t, filepath.Join(d, "config.toml"), cfgStr)
writeFile(t, filepath.Join(d, contentDir, "p1.md"), `
---
title: "P1"
weight: 1