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

Fix some of the "new site" tests

Browse source
This commit is contained in:
Steve Francia 2015-12-08 17:38:26 -05:00
parent b81fc1be4e
commit e29ede7055
2 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
commands/new.go
View file

@ -15,12 +15,12 @@ package commands
import (
"bytes"
"errors"
"os"
"path/filepath"
"strings"
"time"
"errors"
"github.com/spf13/cobra"
"github.com/spf13/hugo/create"
"github.com/spf13/hugo/helpers"

20
commands/new_test.go
View file

@ -1,12 +1,13 @@
package commands
import (
"github.com/spf13/afero"
"github.com/spf13/hugo/hugofs"
"github.com/stretchr/testify/assert"
"os"
"path/filepath"
"testing"
"github.com/spf13/afero"
"github.com/spf13/hugo/hugofs"
"github.com/stretchr/testify/assert"
)
// Issue #1133
@ -41,10 +42,20 @@ func TestDoNewSite(t *testing.T) {
checkNewSiteInited(basepath, t)
}
func TestDoNewSite_noerror_base_exists_but_empty(t *testing.T) {
basepath := filepath.Join(os.TempDir(), "blog")
hugofs.SourceFs = new(afero.MemMapFs)
hugofs.SourceFs.MkdirAll(basepath, 777)
err := doNewSite(basepath, false)
assert.Nil(t, err)
}
func TestDoNewSite_error_base_exists(t *testing.T) {
basepath := filepath.Join(os.TempDir(), "blog")
hugofs.SourceFs = new(afero.MemMapFs)
hugofs.SourceFs.MkdirAll(basepath, 777)
hugofs.SourceFs.Create(filepath.Join(basepath, "foo"))
// Since the directory already exists and isn't empty, expect an error
err := doNewSite(basepath, false)
assert.NotNil(t, err)
}
@ -59,8 +70,7 @@ func TestDoNewSite_force_empty_dir(t *testing.T) {
checkNewSiteInited(basepath, t)
}
// TODO(spf13): Fix and re-enable this.
func _TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
func TestDoNewSite_error_force_dir_inside_exists(t *testing.T) {
basepath := filepath.Join(os.TempDir(), "blog")
contentPath := filepath.Join(basepath, "content")
hugofs.SourceFs = new(afero.MemMapFs)